diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 0dc3498e0..0ee656d8a 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -7,9 +7,7 @@ import { ImpersonationService } from '@ghostfolio/api/services/impersonation.ser
 import {
   PortfolioItem,
   PortfolioOverview,
-  PortfolioPerformance
-} from '@ghostfolio/helper/interfaces';
-import {
+  PortfolioPerformance,
   PortfolioPosition,
   PortfolioReport
 } from '@ghostfolio/helper/interfaces';
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 5b161f749..949446751 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -8,8 +8,7 @@ import {
   PortfolioItem,
   PortfolioOverview
 } from '@ghostfolio/helper/interfaces';
-import { RequestWithUser } from '@ghostfolio/helper/types';
-import { DateRange } from '@ghostfolio/helper/types';
+import { DateRange, RequestWithUser } from '@ghostfolio/helper/types';
 import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import {
diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts
index 1d2b89788..f2e00e846 100644
--- a/apps/api/src/models/portfolio.ts
+++ b/apps/api/src/models/portfolio.ts
@@ -5,11 +5,10 @@ import {
   PortfolioPerformance,
   PortfolioPosition,
   PortfolioReport,
-  Position
+  Position,
+  UserWithSettings
 } from '@ghostfolio/helper/interfaces';
-import { UserWithSettings } from '@ghostfolio/helper/interfaces';
-import { DateRange } from '@ghostfolio/helper/types';
-import { OrderWithAccount } from '@ghostfolio/helper/types';
+import { DateRange, OrderWithAccount } from '@ghostfolio/helper/types';
 import {
   add,
   format,
diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index 498686853..c2b6e74f1 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -7,8 +7,7 @@ import {
 } from '@angular/core';
 import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router';
 import { primaryColorHex, secondaryColorHex } from '@ghostfolio/helper/config';
-import { User } from '@ghostfolio/helper/interfaces';
-import { InfoItem } from '@ghostfolio/helper/interfaces';
+import { InfoItem, User } from '@ghostfolio/helper/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/helper/permissions';
 import { MaterialCssVarsService } from 'angular-material-css-vars';
 import { Subject } from 'rxjs';
diff --git a/apps/client/src/app/pages/analysis/analysis-page.component.ts b/apps/client/src/app/pages/analysis/analysis-page.component.ts
index f32dfff60..8b1cf2ae5 100644
--- a/apps/client/src/app/pages/analysis/analysis-page.component.ts
+++ b/apps/client/src/app/pages/analysis/analysis-page.component.ts
@@ -3,10 +3,10 @@ import { ToggleOption } from '@ghostfolio/client/components/toggle/interfaces/to
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
-import { User } from '@ghostfolio/helper/interfaces';
 import {
   PortfolioItem,
-  PortfolioPosition
+  PortfolioPosition,
+  User
 } from '@ghostfolio/helper/interfaces';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
diff --git a/apps/client/src/app/pages/home/home-page.component.ts b/apps/client/src/app/pages/home/home-page.component.ts
index aa09949cb..afe0500ee 100644
--- a/apps/client/src/app/pages/home/home-page.component.ts
+++ b/apps/client/src/app/pages/home/home-page.component.ts
@@ -11,11 +11,11 @@ import {
   SettingsStorageService
 } from '@ghostfolio/client/services/settings-storage.service';
 import { TokenStorageService } from '@ghostfolio/client/services/token-storage.service';
-import { User } from '@ghostfolio/helper/interfaces';
 import {
   PortfolioOverview,
   PortfolioPerformance,
-  PortfolioPosition
+  PortfolioPosition,
+  User
 } from '@ghostfolio/helper/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/helper/permissions';
 import { DateRange } from '@ghostfolio/helper/types';