diff --git a/packages/sdc-populate/src/SDCPopulateQuestionnaireOperation/utils/addDisplayToCodings.ts b/packages/sdc-populate/src/SDCPopulateQuestionnaireOperation/utils/addDisplayToCodings.ts
index d61f72bf..b38ffee6 100644
--- a/packages/sdc-populate/src/SDCPopulateQuestionnaireOperation/utils/addDisplayToCodings.ts
+++ b/packages/sdc-populate/src/SDCPopulateQuestionnaireOperation/utils/addDisplayToCodings.ts
@@ -20,11 +20,8 @@ import type {
   InitialExpression
 } from '../interfaces/expressions.interface';
 import type { Coding } from 'fhir/r4';
-import {
-  getCodeSystemLookupPromise,
-  LookupResponse,
-  lookupResponseIsValid
-} from '../api/lookupCodeSystem';
+import type { LookupResponse } from '../api/lookupCodeSystem';
+import { getCodeSystemLookupPromise, lookupResponseIsValid } from '../api/lookupCodeSystem';
 import type { FetchResourceCallback } from '../interfaces';
 
 export async function addDisplayToInitialExpressionsCodings(
diff --git a/packages/smart-forms-renderer/src/interfaces/questionnaireStore.interface.ts b/packages/smart-forms-renderer/src/interfaces/questionnaireStore.interface.ts
index f59824b5..d0ea6b34 100644
--- a/packages/smart-forms-renderer/src/interfaces/questionnaireStore.interface.ts
+++ b/packages/smart-forms-renderer/src/interfaces/questionnaireStore.interface.ts
@@ -22,7 +22,7 @@ import type { EnableWhenExpressions, EnableWhenItems } from './enableWhen.interf
 import type { CalculatedExpression } from './calculatedExpression.interface';
 import type { AnswerExpression } from './answerExpression.interface';
 import type { Coding, QuestionnaireItemAnswerOption } from 'fhir/r4';
-import { InitialExpression } from './initialExpression.interface';
+import type { InitialExpression } from './initialExpression.interface';
 
 export interface QuestionnaireModel {
   itemTypes: Record<string, string>;
diff --git a/packages/smart-forms-renderer/src/stores/questionnaireStore.ts b/packages/smart-forms-renderer/src/stores/questionnaireStore.ts
index 7ffb9dd8..34c3844c 100644
--- a/packages/smart-forms-renderer/src/stores/questionnaireStore.ts
+++ b/packages/smart-forms-renderer/src/stores/questionnaireStore.ts
@@ -47,7 +47,7 @@ import { mutateRepeatEnableWhenExpressionInstances } from '../utils/enableWhenEx
 import { questionnaireResponseStore } from './questionnaireResponseStore';
 import { createQuestionnaireResponseItemMap } from '../utils/questionnaireResponseStoreUtils/updatableResponseItems';
 import { insertCompleteAnswerOptionsIntoQuestionnaire } from '../utils/questionnaireStoreUtils/insertAnswerOptions';
-import { InitialExpression } from '../interfaces/initialExpression.interface';
+import type { InitialExpression } from '../interfaces/initialExpression.interface';
 
 /**
  * QuestionnaireStore properties and methods
diff --git a/packages/smart-forms-renderer/src/utils/questionnaireStoreUtils/extractOtherExtensions.ts b/packages/smart-forms-renderer/src/utils/questionnaireStoreUtils/extractOtherExtensions.ts
index 54f645c8..960e0595 100644
--- a/packages/smart-forms-renderer/src/utils/questionnaireStoreUtils/extractOtherExtensions.ts
+++ b/packages/smart-forms-renderer/src/utils/questionnaireStoreUtils/extractOtherExtensions.ts
@@ -49,7 +49,7 @@ import {
   getEnableWhenExpression,
   getInitialExpression
 } from '../getExpressionsFromItem';
-import { InitialExpression } from '../../interfaces/initialExpression.interface';
+import type { InitialExpression } from '../../interfaces/initialExpression.interface';
 
 interface ReturnParamsRecursive {
   variables: Variables;
diff --git a/packages/smart-forms-renderer/src/utils/repopulateItems.ts b/packages/smart-forms-renderer/src/utils/repopulateItems.ts
index 91146bd1..aad2c40a 100644
--- a/packages/smart-forms-renderer/src/utils/repopulateItems.ts
+++ b/packages/smart-forms-renderer/src/utils/repopulateItems.ts
@@ -86,7 +86,7 @@ export function generateItemsToRepopulate(populatedResponse: QuestionnaireRespon
   const initialExpressions = questionnaireStore.getState().initialExpressions;
 
   // This function is able to capture additions, however it is not able to capture deletions
-  let itemsToRepopulate = getItemsToRepopulate({
+  const itemsToRepopulate = getItemsToRepopulate({
     sourceQuestionnaire,
     tabs,
     populatedResponse,