diff --git a/packages/geoview-core/src/api/config/types/classes/sub-layer-config/config-base-class.ts b/packages/geoview-core/src/api/config/types/classes/sub-layer-config/config-base-class.ts
index 87a9c76a740..fead88ff615 100644
--- a/packages/geoview-core/src/api/config/types/classes/sub-layer-config/config-base-class.ts
+++ b/packages/geoview-core/src/api/config/types/classes/sub-layer-config/config-base-class.ts
@@ -20,6 +20,7 @@ export abstract class ConfigBaseClass {
   #parentNode: ConfigBaseClass | undefined = undefined;
 
   /** Used internally to distinguish layer groups derived from the metadata. */
+  // TODO: Refactor - Add this back?
   // #isMetadataLayerGroup?: false;
 
   /** The identifier of the layer to display on the map. This element is part of the schema. */
diff --git a/packages/geoview-core/src/core/components/common/layer-title.tsx b/packages/geoview-core/src/core/components/common/layer-title.tsx
index 0277c2dca0e..b40a852e539 100644
--- a/packages/geoview-core/src/core/components/common/layer-title.tsx
+++ b/packages/geoview-core/src/core/components/common/layer-title.tsx
@@ -32,7 +32,7 @@ export function LayerTitle({ children, hideTitle, fullWidth }: LayerTitleProp):
   );
 }
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 LayerTitle.defaultProps = {
   hideTitle: false,
   fullWidth: false,
diff --git a/packages/geoview-core/src/core/components/common/layout.tsx b/packages/geoview-core/src/core/components/common/layout.tsx
index 6d87eb0a66e..9d0e548e311 100644
--- a/packages/geoview-core/src/core/components/common/layout.tsx
+++ b/packages/geoview-core/src/core/components/common/layout.tsx
@@ -76,7 +76,7 @@ export function Layout({
   );
 }
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 Layout.defaultProps = {
   children: null,
   onIsEnlargeClicked: undefined,
diff --git a/packages/geoview-core/src/core/components/common/responsive-grid-layout.tsx b/packages/geoview-core/src/core/components/common/responsive-grid-layout.tsx
index d126a2fd160..208af3cd1a5 100644
--- a/packages/geoview-core/src/core/components/common/responsive-grid-layout.tsx
+++ b/packages/geoview-core/src/core/components/common/responsive-grid-layout.tsx
@@ -323,7 +323,7 @@ const ResponsiveGridLayout = forwardRef(
 
 ResponsiveGridLayout.displayName = 'ResponsiveGridLayout';
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ResponsiveGridLayout.defaultProps = {
   leftTop: null,
   leftMain: null,
diff --git a/packages/geoview-core/src/core/components/common/responsive-grid.tsx b/packages/geoview-core/src/core/components/common/responsive-grid.tsx
index f08e11e54fb..c57401fd384 100644
--- a/packages/geoview-core/src/core/components/common/responsive-grid.tsx
+++ b/packages/geoview-core/src/core/components/common/responsive-grid.tsx
@@ -135,13 +135,13 @@ export const ResponsiveGrid = {
   Right: ResponsiveGridRightPanel,
 };
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ResponsiveGridLeftPanel.defaultProps = {
   sxProps: undefined,
   fullWidth: false,
 };
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ResponsiveGridRightPanel.defaultProps = {
   sxProps: undefined,
   fullWidth: false,
diff --git a/packages/geoview-core/src/core/components/data-table/data-panel.tsx b/packages/geoview-core/src/core/components/data-table/data-panel.tsx
index cd455730555..04c3ebc25da 100644
--- a/packages/geoview-core/src/core/components/data-table/data-panel.tsx
+++ b/packages/geoview-core/src/core/components/data-table/data-panel.tsx
@@ -231,7 +231,7 @@ export function Datapanel({ fullWidth }: DataPanelType): JSX.Element {
   );
 }
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 Datapanel.defaultProps = {
   fullWidth: false,
 };
diff --git a/packages/geoview-core/src/core/components/data-table/export-button.tsx b/packages/geoview-core/src/core/components/data-table/export-button.tsx
index 09ad4f48ab4..e2066f0ae6a 100644
--- a/packages/geoview-core/src/core/components/data-table/export-button.tsx
+++ b/packages/geoview-core/src/core/components/data-table/export-button.tsx
@@ -94,7 +94,7 @@ function ExportButton({ rows, columns, children }: ExportButtonProps): JSX.Eleme
   );
 }
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ExportButton.defaultProps = { children: '' };
 
 export default ExportButton;
diff --git a/packages/geoview-core/src/core/components/details/details-panel.tsx b/packages/geoview-core/src/core/components/details/details-panel.tsx
index 3c4c7ab1f70..bde763dc98f 100644
--- a/packages/geoview-core/src/core/components/details/details-panel.tsx
+++ b/packages/geoview-core/src/core/components/details/details-panel.tsx
@@ -482,7 +482,7 @@ export function DetailsPanel({ fullWidth }: DetailsPanelType): JSX.Element {
   // # endregion
 }
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 DetailsPanel.defaultProps = {
   fullWidth: false,
 };
diff --git a/packages/geoview-core/src/core/components/export/export-modal-button.tsx b/packages/geoview-core/src/core/components/export/export-modal-button.tsx
index 6905369bcf4..b8bb9d860ab 100644
--- a/packages/geoview-core/src/core/components/export/export-modal-button.tsx
+++ b/packages/geoview-core/src/core/components/export/export-modal-button.tsx
@@ -40,7 +40,7 @@ export default function ExportButton(props: ExportProps): JSX.Element {
 /**
  * default properties values
  */
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ExportButton.defaultProps = {
   className: '',
   sxDetails: undefined,
diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/raster/esri-dynamic.ts b/packages/geoview-core/src/geo/layer/geoview-layers/raster/esri-dynamic.ts
index 71f34fd21c9..d3569dcbd2a 100644
--- a/packages/geoview-core/src/geo/layer/geoview-layers/raster/esri-dynamic.ts
+++ b/packages/geoview-core/src/geo/layer/geoview-layers/raster/esri-dynamic.ts
@@ -433,8 +433,9 @@ export class EsriDynamic extends AbstractGeoViewRaster {
    * @returns {TypeFieldOfTheSameValue[][]} The result of the evaluation. The first index of the array correspond to the field's
    * index in the style settings and the second one to the number of different values the field may have based on visibility of
    * the feature.
+   * @private
    */
-  private static countFieldOfTheSameValue(styleSettings: TypeUniqueValueStyleConfig): TypeFieldOfTheSameValue[][] {
+  static #countFieldOfTheSameValue(styleSettings: TypeUniqueValueStyleConfig): TypeFieldOfTheSameValue[][] {
     return styleSettings.uniqueValueStyleInfo.reduce<TypeFieldOfTheSameValue[][]>(
       (counter, styleEntry): TypeFieldOfTheSameValue[][] => {
         if (
@@ -645,7 +646,7 @@ export class EsriDynamic extends AbstractGeoViewRaster {
           return `(1=1)${layerFilter ? ` and (${layerFilter})` : ''}`;
 
         // This section of code optimize the query to reduce it at it shortest expression.
-        const fieldOfTheSameValue = EsriDynamic.countFieldOfTheSameValue(styleSettings);
+        const fieldOfTheSameValue = EsriDynamic.#countFieldOfTheSameValue(styleSettings);
         const fieldOrder = EsriDynamic.sortFieldOfTheSameValue(styleSettings, fieldOfTheSameValue);
         const queryTree = EsriDynamic.getQueryTree(styleSettings, fieldOfTheSameValue, fieldOrder);
         const query = this.buildQuery(queryTree, 0, fieldOrder, styleSettings, layerConfig.source.featureInfo!);
diff --git a/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts b/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts
index 7afb42890d8..eef6d177540 100644
--- a/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts
+++ b/packages/geoview-core/src/geo/layer/geoview-layers/vector/ogc-feature.ts
@@ -91,6 +91,7 @@ export const geoviewEntryIsOgcFeature = (
  */
 // ******************************************************************************************************************************
 export class OgcFeature extends AbstractGeoViewVector {
+  // TODO: Check - If this still used?
   // private variable holding wfs version
   // private version = '2.0.0';
 
diff --git a/packages/geoview-core/src/geo/map/map-viewer.ts b/packages/geoview-core/src/geo/map/map-viewer.ts
index 819a8492b6e..abecfeeb3c9 100644
--- a/packages/geoview-core/src/geo/map/map-viewer.ts
+++ b/packages/geoview-core/src/geo/map/map-viewer.ts
@@ -21,7 +21,7 @@ import { LayerApi } from '@/geo/layer/layer';
 import { TypeFeatureStyle } from '@/geo/layer/geometry/geometry-types';
 import { Projection } from '@/geo/utils/projection';
 
-import { API, api, unmountMap } from '@/app';
+import { api, unmountMap } from '@/app';
 import { Plugin } from '@/api/plugin/plugin';
 import { TypeRecordOfPlugin } from '@/api/plugin/plugin-types';
 
@@ -1476,7 +1476,7 @@ export class MapViewer {
     setTimeout(
       // eslint-disable-next-line @typescript-eslint/no-misused-promises
       () =>
-        API.createMapFromConfig(mapDiv.id, JSON.stringify(config)).catch((error) => {
+        api.createMapFromConfig(mapDiv.id, JSON.stringify(config)).catch((error) => {
           // Log
           logger.logError(`Couldn't reload the map in map-viewer`, error);
         }),
diff --git a/packages/geoview-core/src/ui/button-drop-down/button-drop-down.tsx b/packages/geoview-core/src/ui/button-drop-down/button-drop-down.tsx
index 54c728ae7ae..2f31af1a7e6 100644
--- a/packages/geoview-core/src/ui/button-drop-down/button-drop-down.tsx
+++ b/packages/geoview-core/src/ui/button-drop-down/button-drop-down.tsx
@@ -127,7 +127,7 @@ export function ButtonDropDown(props: ButtonDropDownProps): JSX.Element {
   // #endregion
 }
 
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ButtonDropDown.defaultProps = {
   onButtonClick: null,
 };
diff --git a/packages/geoview-core/src/ui/linear-progress/linear-progress.tsx b/packages/geoview-core/src/ui/linear-progress/linear-progress.tsx
index cabac7fe310..cfc23da36f2 100644
--- a/packages/geoview-core/src/ui/linear-progress/linear-progress.tsx
+++ b/packages/geoview-core/src/ui/linear-progress/linear-progress.tsx
@@ -31,7 +31,7 @@ export function ProgressBar(props: ProgressbarProps): JSX.Element {
 /**
  * Default property values
  */
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 ProgressBar.defaultProps = {
   className: '',
   variant: 'indeterminate',
diff --git a/packages/geoview-core/src/ui/list/checkbox-list/checkbox-list.tsx b/packages/geoview-core/src/ui/list/checkbox-list/checkbox-list.tsx
index 25618f82e00..793a7a42496 100644
--- a/packages/geoview-core/src/ui/list/checkbox-list/checkbox-list.tsx
+++ b/packages/geoview-core/src/ui/list/checkbox-list/checkbox-list.tsx
@@ -115,7 +115,7 @@ export function CheckboxList(props: CheckboxListProps): JSX.Element {
 /**
  * React's default properties for the CheckboxList
  */
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 CheckboxList.defaultProps = {
   onChecked: null,
 };
diff --git a/packages/geoview-core/src/ui/panel/panel.tsx b/packages/geoview-core/src/ui/panel/panel.tsx
index 9b2c148cf58..ffa3e792f89 100644
--- a/packages/geoview-core/src/ui/panel/panel.tsx
+++ b/packages/geoview-core/src/ui/panel/panel.tsx
@@ -151,7 +151,7 @@ export function Panel(props: TypePanelAppProps): JSX.Element {
 /**
  * React's default properties for the Panel
  */
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 Panel.defaultProps = {
   onPanelOpened: null,
   onPanelClosed: null,
diff --git a/packages/geoview-core/src/ui/slider/slider.tsx b/packages/geoview-core/src/ui/slider/slider.tsx
index 843a9dedf1a..45c88ab1492 100644
--- a/packages/geoview-core/src/ui/slider/slider.tsx
+++ b/packages/geoview-core/src/ui/slider/slider.tsx
@@ -211,7 +211,7 @@ export function Slider(props: SliderProps): JSX.Element {
 /**
  * The default props
  */
-// TODO: Refactor - Remove defaltProps as it's no longer a good practice
+// TODO: Refactor - Remove defaultProps as it's no longer a good practice
 Slider.defaultProps = {
   sliderId: generateId(),
   className: undefined,