diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
index f74381599..55f6c072f 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
@@ -39,6 +39,7 @@ export class FirePageComponent implements OnDestroy, OnInit {
   public ngOnInit() {
     this.isLoading = true;
     this.deviceType = this.deviceService.getDeviceInfo().deviceType;
+
     this.dataService
       .fetchPortfolioDetails({})
       .pipe(takeUntil(this.unsubscribeSubject))
diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts
index 8fa68e5c5..23003269f 100644
--- a/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts
+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.component.ts
@@ -62,8 +62,8 @@ export class FireCalculatorComponent
     annualInterestRate: new FormControl<number>(undefined),
     paymentPerPeriod: new FormControl<number>(undefined),
     principalInvestmentAmount: new FormControl<number>(undefined),
-    time: new FormControl<number>(undefined),
-    retirementNetWorth: new FormControl<number>(undefined)
+    retirementNetWorth: new FormControl<number>(undefined),
+    time: new FormControl<number>(undefined)
   });
   public chart: Chart<'bar'>;
   public isLoading = true;
@@ -91,8 +91,8 @@ export class FireCalculatorComponent
         annualInterestRate: 5,
         paymentPerPeriod: this.savingsRate,
         principalInvestmentAmount: 0,
-        time: 10,
-        retirementNetWorth: this.targetNetWorth
+        retirementNetWorth: this.targetNetWorth,
+        time: 10
       },
       {
         emitEvent: false
diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.service.spec.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.service.spec.ts
index bf48bfa50..492834366 100644
--- a/libs/ui/src/lib/fire-calculator/fire-calculator.service.spec.ts
+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.service.spec.ts
@@ -16,10 +16,6 @@ describe('FireCalculatorService', () => {
     );
   });
 
-  it('true', async () => {
-    expect(true).toBe(true);
-  });
-
   describe('Test periods to retire', () => {
     it('should return the correct amount of periods to retire with no interst rate', async () => {
       const r = 0;
diff --git a/libs/ui/src/lib/fire-calculator/fire-calculator.service.ts b/libs/ui/src/lib/fire-calculator/fire-calculator.service.ts
index 8dcd58cda..ca57a5380 100644
--- a/libs/ui/src/lib/fire-calculator/fire-calculator.service.ts
+++ b/libs/ui/src/lib/fire-calculator/fire-calculator.service.ts
@@ -53,7 +53,7 @@ export class FireCalculatorService {
     totalAmount: number;
   }) {
     if (r == 0) {
-      //No compound interest
+      // No compound interest
       return (totalAmount - P) / PMT;
     } else if (totalAmount <= 0) {
       return 0;