diff --git a/src/calculations/spaces/common area/auditorium.ts b/src/calculations/spaces/common area/auditorium.ts
index 8c4df0a..86e3b3c 100644
--- a/src/calculations/spaces/common area/auditorium.ts	
+++ b/src/calculations/spaces/common area/auditorium.ts	
@@ -5,7 +5,7 @@ export default class Auditorium extends MainSpace {
    * Calculates the area of the auditorum. 0 if there is no canteen.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToAuditorium) {
       return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.variables.seatsInAuditorium
     }
diff --git a/src/calculations/spaces/common area/canteen.ts b/src/calculations/spaces/common area/canteen.ts
index 0180ebd..c8acd79 100644
--- a/src/calculations/spaces/common area/canteen.ts	
+++ b/src/calculations/spaces/common area/canteen.ts	
@@ -5,7 +5,7 @@ export default class Canteen extends MainSpace {
    * Calculates the area of the canteen. 0 if there is no canteen.
    * @returns 
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCanteen) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() + this.addedPeakArea()
     }
diff --git a/src/calculations/spaces/common area/cleaning.ts b/src/calculations/spaces/common area/cleaning.ts
index c0eb733..4e7dc09 100644
--- a/src/calculations/spaces/common area/cleaning.ts	
+++ b/src/calculations/spaces/common area/cleaning.ts	
@@ -5,7 +5,7 @@ export default class CommonCleaning extends MainSpace {
    * Calculates the area of common cleaning.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/common area/course.ts b/src/calculations/spaces/common area/course.ts
index 2afe965..c4fe1ee 100644
--- a/src/calculations/spaces/common area/course.ts	
+++ b/src/calculations/spaces/common area/course.ts	
@@ -5,7 +5,7 @@ export default class Course extends MainSpace {
    * Calculates the area of course room. 0 if there is no need.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCourseSpace) {
       return this.dimensionedAttendance() * this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType
     }
diff --git a/src/calculations/spaces/common area/exerciseroom.ts b/src/calculations/spaces/common area/exerciseroom.ts
index 1100c71..e6a8f87 100644
--- a/src/calculations/spaces/common area/exerciseroom.ts	
+++ b/src/calculations/spaces/common area/exerciseroom.ts	
@@ -4,7 +4,7 @@ export default class CommonExerciseRoom extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class CommonExerciseRoom extends MainSpace {
    * Calculates the area of the work toilet
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToExercise) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
     }
diff --git a/src/calculations/spaces/common area/hwc.ts b/src/calculations/spaces/common area/hwc.ts
index 51ee150..8cd6014 100644
--- a/src/calculations/spaces/common area/hwc.ts	
+++ b/src/calculations/spaces/common area/hwc.ts	
@@ -4,7 +4,7 @@ export default class CommonHwc extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class CommonHwc extends MainSpace {
    * Calculates the area of the common HWC
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/common area/kitchen.ts b/src/calculations/spaces/common area/kitchen.ts
index fc4ac2a..bbc0106 100644
--- a/src/calculations/spaces/common area/kitchen.ts	
+++ b/src/calculations/spaces/common area/kitchen.ts	
@@ -5,7 +5,7 @@ export default class Kitchen extends MainSpace {
    * Calculates the area of the kitchen based on the number of employees and the area per role. It is 0 if there is no canteen.
    * @returns {number} The area of the kitchen
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCanteen) {
       return this.spaceConstants.areaPerRole * this.variables.numberOfEmployees
     }
diff --git a/src/calculations/spaces/common area/lobby.ts b/src/calculations/spaces/common area/lobby.ts
index 73628bd..8589709 100644
--- a/src/calculations/spaces/common area/lobby.ts	
+++ b/src/calculations/spaces/common area/lobby.ts	
@@ -7,7 +7,7 @@ export default class Lobby extends MainSpace {
    * Calculates the lobby area. 0 if there is no need.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToAuditorium || this.variables.accessToCourseSpace) {
       // Get the area of the auditorium and the course space
       const auditorium = new Auditorium(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/common area/reception.ts b/src/calculations/spaces/common area/reception.ts
index 49e7a88..02bf9e6 100644
--- a/src/calculations/spaces/common area/reception.ts	
+++ b/src/calculations/spaces/common area/reception.ts	
@@ -5,7 +5,7 @@ export default class CommonReception extends MainSpace {
    * Calculates the area of common area reception.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/common area/special.ts b/src/calculations/spaces/common area/special.ts
index 83aebb9..2a1f43d 100644
--- a/src/calculations/spaces/common area/special.ts	
+++ b/src/calculations/spaces/common area/special.ts	
@@ -5,7 +5,7 @@ export default class CommonSpecial extends MainSpace {
    * Calculates the area of the special rooms.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.variables.specialAreaCommon
   }
 }
diff --git a/src/calculations/spaces/common area/stockarchive.ts b/src/calculations/spaces/common area/stockarchive.ts
index 924c560..e463025 100644
--- a/src/calculations/spaces/common area/stockarchive.ts	
+++ b/src/calculations/spaces/common area/stockarchive.ts	
@@ -5,7 +5,7 @@ export default class CommonStockArchive extends MainSpace {
    * Calculates the area of stock/archive.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/common area/toilet.ts b/src/calculations/spaces/common area/toilet.ts
index b6d1b2c..c66bc76 100644
--- a/src/calculations/spaces/common area/toilet.ts	
+++ b/src/calculations/spaces/common area/toilet.ts	
@@ -4,7 +4,7 @@ export default class CommonToilet extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class CommonToilet extends MainSpace {
    * Calculates the area of the work toilet
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/common area/waitingzone.ts b/src/calculations/spaces/common area/waitingzone.ts
index 140ddcb..65698b0 100644
--- a/src/calculations/spaces/common area/waitingzone.ts	
+++ b/src/calculations/spaces/common area/waitingzone.ts	
@@ -5,7 +5,7 @@ export default class CommonWaitingZone extends MainSpace {
    * Calculates the area of common waiting zone.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/common area/wardrobe.ts b/src/calculations/spaces/common area/wardrobe.ts
index 1f2adbc..19abe0f 100644
--- a/src/calculations/spaces/common area/wardrobe.ts	
+++ b/src/calculations/spaces/common area/wardrobe.ts	
@@ -5,7 +5,7 @@ export default class CommonWardrobe extends MainSpace {
    * Calculates the area of the common wardrobe
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/shared area/dockin.ts b/src/calculations/spaces/shared area/dockin.ts
index 6f54fd5..fa828f0 100644
--- a/src/calculations/spaces/shared area/dockin.ts	
+++ b/src/calculations/spaces/shared area/dockin.ts	
@@ -5,7 +5,7 @@ export default class SharedDockin extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     if (this.variables.accessToCoworking) {
       return this.variables.dockinShare * this.variables.coworkingShare
     }
@@ -16,7 +16,7 @@ export default class SharedDockin extends MainSpace {
    * Calculates the area of shared dockin. 0 if there is no desire.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       return this.personsPerType() * this.areaPerPersonExcludingCorridor() + this.addedPeakArea()
     }
diff --git a/src/calculations/spaces/shared area/hwc.ts b/src/calculations/spaces/shared area/hwc.ts
index d3df86b..5dcdd7a 100644
--- a/src/calculations/spaces/shared area/hwc.ts	
+++ b/src/calculations/spaces/shared area/hwc.ts	
@@ -4,7 +4,7 @@ export default class SharedHwc extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class SharedHwc extends MainSpace {
    * Calculates the area of the shared hwc.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare
     }
diff --git a/src/calculations/spaces/shared area/lounge.ts b/src/calculations/spaces/shared area/lounge.ts
index 11cf4be..4c87d12 100644
--- a/src/calculations/spaces/shared area/lounge.ts	
+++ b/src/calculations/spaces/shared area/lounge.ts	
@@ -5,7 +5,7 @@ export default class SharedLounge extends MainSpace {
    * Calculates the area of shared dockin. 0 if there is no desire.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     // SUM((AJ4*AR24*AQ24)+(AB24*AQ24))
     if (this.variables.accessToCoworking) {
       return (this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType()) + (this.addedPeakArea() * this.sharePerWorkspaceType())
diff --git a/src/calculations/spaces/shared area/meetingroom_large.ts b/src/calculations/spaces/shared area/meetingroom_large.ts
index d9724e1..b31a073 100644
--- a/src/calculations/spaces/shared area/meetingroom_large.ts	
+++ b/src/calculations/spaces/shared area/meetingroom_large.ts	
@@ -21,7 +21,7 @@ export default class SharedLargeMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/shared area/meetingroom_medium.ts b/src/calculations/spaces/shared area/meetingroom_medium.ts
index 87517af..b796a90 100644
--- a/src/calculations/spaces/shared area/meetingroom_medium.ts	
+++ b/src/calculations/spaces/shared area/meetingroom_medium.ts	
@@ -21,7 +21,7 @@ export default class SharedMediumMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/shared area/meetingroom_small.ts b/src/calculations/spaces/shared area/meetingroom_small.ts
index 4c0d5d6..9e39177 100644
--- a/src/calculations/spaces/shared area/meetingroom_small.ts	
+++ b/src/calculations/spaces/shared area/meetingroom_small.ts	
@@ -21,7 +21,7 @@ export default class SharedSmallMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/shared area/multiroom.ts b/src/calculations/spaces/shared area/multiroom.ts
index a019ca5..a367a20 100644
--- a/src/calculations/spaces/shared area/multiroom.ts	
+++ b/src/calculations/spaces/shared area/multiroom.ts	
@@ -11,7 +11,7 @@ export default class SharedMultiroom extends MainSpace {
    * Calculates the area of shared multiroom.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       //=SUM((AP4:AP10)*AR26*AQ26)+(AB26)
       const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/shared area/personalstorage.ts b/src/calculations/spaces/shared area/personalstorage.ts
index 965ae59..dd1f2fc 100644
--- a/src/calculations/spaces/shared area/personalstorage.ts	
+++ b/src/calculations/spaces/shared area/personalstorage.ts	
@@ -5,7 +5,7 @@ export default class SharedPersonalStorage extends MainSpace {
    * Calculates the area of the personal storage
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       return this.calculateEmployeesPerWorkplaceTypeUnadjusted() * this.sharePerWorkspaceType() * this.areaPerPersonExcludingCorridor()
     }
diff --git a/src/calculations/spaces/shared area/projectroom.ts b/src/calculations/spaces/shared area/projectroom.ts
index 1161f2f..ca803b1 100644
--- a/src/calculations/spaces/shared area/projectroom.ts	
+++ b/src/calculations/spaces/shared area/projectroom.ts	
@@ -5,7 +5,7 @@ export default class SharedProjectroom extends MainSpace {
    * Calculates the area of the shred project room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToReception) {
       return this.calculateEmployeesPerWorkplaceTypeUnadjusted() * this.areaPerPersonExcludingCorridor()
     }
diff --git a/src/calculations/spaces/shared area/reception.ts b/src/calculations/spaces/shared area/reception.ts
index 43b59a3..f3a2ee6 100644
--- a/src/calculations/spaces/shared area/reception.ts	
+++ b/src/calculations/spaces/shared area/reception.ts	
@@ -5,7 +5,7 @@ export default class SharedReception extends MainSpace {
    * Calculates the area of shared reception. 0 if there is no desire.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToReception) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare
     }
diff --git a/src/calculations/spaces/shared area/special.ts b/src/calculations/spaces/shared area/special.ts
index c64ae50..732a8d0 100644
--- a/src/calculations/spaces/shared area/special.ts	
+++ b/src/calculations/spaces/shared area/special.ts	
@@ -5,7 +5,7 @@ export default class SharedSpecial extends MainSpace {
    * Calculates the area of the special rooms.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.variables.specialAreaShared
   }
 }
diff --git a/src/calculations/spaces/shared area/toilet.ts b/src/calculations/spaces/shared area/toilet.ts
index 910d22f..c1ff5e9 100644
--- a/src/calculations/spaces/shared area/toilet.ts	
+++ b/src/calculations/spaces/shared area/toilet.ts	
@@ -4,7 +4,7 @@ export default class SharedToilet extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class SharedToilet extends MainSpace {
    * Calculates the area of the shared toilet.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare
     }
diff --git a/src/calculations/spaces/shared area/touchdown.ts b/src/calculations/spaces/shared area/touchdown.ts
index 8298ac3..fd901ca 100644
--- a/src/calculations/spaces/shared area/touchdown.ts	
+++ b/src/calculations/spaces/shared area/touchdown.ts	
@@ -5,7 +5,7 @@ export default class SharedTouchdown extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     if (this.variables.accessToCoworking) {
       return this.variables.touchdownShare * this.variables.coworkingShare
     }
@@ -16,7 +16,7 @@ export default class SharedTouchdown extends MainSpace {
    * Calculates the area of shared touchdown. 0 if there is no desire.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       return this.personsPerType() * this.areaPerPersonExcludingCorridor() + this.addedPeakArea()
     }
diff --git a/src/calculations/spaces/shared area/waitingzone.ts b/src/calculations/spaces/shared area/waitingzone.ts
index 0a2dd5e..724333b 100644
--- a/src/calculations/spaces/shared area/waitingzone.ts	
+++ b/src/calculations/spaces/shared area/waitingzone.ts	
@@ -5,7 +5,7 @@ export default class SharedWaitingZone extends MainSpace {
    * Calculates the area of shared wating zone in reception. 0 if there is no desire.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToReception) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare
     }
diff --git a/src/calculations/spaces/shared area/wardrobe.ts b/src/calculations/spaces/shared area/wardrobe.ts
index 592474f..d581207 100644
--- a/src/calculations/spaces/shared area/wardrobe.ts	
+++ b/src/calculations/spaces/shared area/wardrobe.ts	
@@ -5,7 +5,7 @@ export default class SharedWardrobe extends MainSpace {
    * Calculates the area of the wardrobe
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToCoworking) {
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.variables.coworkingShare
     }
diff --git a/src/calculations/spaces/work related area/celloffice.ts b/src/calculations/spaces/work related area/celloffice.ts
index ea4ddbd..8379172 100644
--- a/src/calculations/spaces/work related area/celloffice.ts	
+++ b/src/calculations/spaces/work related area/celloffice.ts	
@@ -5,7 +5,7 @@ export default class CellOffice extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     if (this.variables.accessToCellOffice) {
       return this.variables.cellOfficeShare
     }
@@ -16,7 +16,7 @@ export default class CellOffice extends MainSpace {
    * Calculates the area of the cell.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType()
   }
 }
diff --git a/src/calculations/spaces/work related area/cleaning.ts b/src/calculations/spaces/work related area/cleaning.ts
index a7d7d54..905998d 100644
--- a/src/calculations/spaces/work related area/cleaning.ts	
+++ b/src/calculations/spaces/work related area/cleaning.ts	
@@ -5,7 +5,7 @@ export default class Cleaning extends MainSpace {
    * Calculates the area of cleaning
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/work related area/coffeestation.ts b/src/calculations/spaces/work related area/coffeestation.ts
index 35e0e15..3b1ddc1 100644
--- a/src/calculations/spaces/work related area/coffeestation.ts	
+++ b/src/calculations/spaces/work related area/coffeestation.ts	
@@ -4,7 +4,7 @@ export default class CoffeeStation extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class CoffeeStation extends MainSpace {
    * Calculates the area of the coffee station.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() + this.addedPeakArea()
   }
 }
diff --git a/src/calculations/spaces/work related area/copyarchive.ts b/src/calculations/spaces/work related area/copyarchive.ts
index 51562c4..5412ea3 100644
--- a/src/calculations/spaces/work related area/copyarchive.ts	
+++ b/src/calculations/spaces/work related area/copyarchive.ts	
@@ -5,7 +5,7 @@ export default class CopyArchive extends MainSpace {
    * Calculates the area of the copy/archive
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/work related area/dockin.ts b/src/calculations/spaces/work related area/dockin.ts
index f1230e4..8904bd9 100644
--- a/src/calculations/spaces/work related area/dockin.ts	
+++ b/src/calculations/spaces/work related area/dockin.ts	
@@ -6,7 +6,7 @@ export default class WorkDockin extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     // We need the shared dock in share for the calculation of the work dock in share
     const sharedDockin = new SharedDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     return this.variables.dockinShare - sharedDockin.sharePerWorkspaceType()
@@ -16,7 +16,7 @@ export default class WorkDockin extends MainSpace {
    * Calculates the area of touchdown. 0 if there is no need.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return (this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()*this.sharePerWorkspaceType())+(this.addedPeakArea()*this.sharePerWorkspaceType())
   }
 }
diff --git a/src/calculations/spaces/work related area/focusroom.ts b/src/calculations/spaces/work related area/focusroom.ts
index 2bb40d2..7de6c28 100644
--- a/src/calculations/spaces/work related area/focusroom.ts	
+++ b/src/calculations/spaces/work related area/focusroom.ts	
@@ -5,7 +5,7 @@ export default class Focusroom extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     return this.variables.focusroomShare
   }
 
@@ -13,7 +13,7 @@ export default class Focusroom extends MainSpace {
    * Calculates the area of the project room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType()
   }
 }
diff --git a/src/calculations/spaces/work related area/hwc.ts b/src/calculations/spaces/work related area/hwc.ts
index 0ce6308..b9918e4 100644
--- a/src/calculations/spaces/work related area/hwc.ts	
+++ b/src/calculations/spaces/work related area/hwc.ts	
@@ -4,7 +4,7 @@ export default class WorkHwc extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class WorkHwc extends MainSpace {
    * Calculates the area of the work hwc.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/work related area/landscape.ts b/src/calculations/spaces/work related area/landscape.ts
index da35dcb..3ec7c5e 100644
--- a/src/calculations/spaces/work related area/landscape.ts	
+++ b/src/calculations/spaces/work related area/landscape.ts	
@@ -5,7 +5,7 @@ export default class Landscape extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     if (this.variables.accessToCellOffice) {
       return this.variables.landscapeShare
     } else {
@@ -18,7 +18,7 @@ export default class Landscape extends MainSpace {
    * Calculates the area of the landscape.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType()
   }
 }
diff --git a/src/calculations/spaces/work related area/meetingroom_large.ts b/src/calculations/spaces/work related area/meetingroom_large.ts
index c69892a..2ab201d 100644
--- a/src/calculations/spaces/work related area/meetingroom_large.ts	
+++ b/src/calculations/spaces/work related area/meetingroom_large.ts	
@@ -24,7 +24,7 @@ export default class WorkLargeMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const workTouchdown = new WorkTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/work related area/meetingroom_medium.ts b/src/calculations/spaces/work related area/meetingroom_medium.ts
index 9787b9c..7f3991e 100644
--- a/src/calculations/spaces/work related area/meetingroom_medium.ts	
+++ b/src/calculations/spaces/work related area/meetingroom_medium.ts	
@@ -24,7 +24,7 @@ export default class WorkMediumMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const workTouchdown = new WorkTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/work related area/meetingroom_mini.ts b/src/calculations/spaces/work related area/meetingroom_mini.ts
index 08de265..2d74450 100644
--- a/src/calculations/spaces/work related area/meetingroom_mini.ts	
+++ b/src/calculations/spaces/work related area/meetingroom_mini.ts	
@@ -23,7 +23,7 @@ export default class WorkMiniMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const workTouchdown = new WorkTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/work related area/meetingroom_small.ts b/src/calculations/spaces/work related area/meetingroom_small.ts
index 7eee255..df7f7ad 100644
--- a/src/calculations/spaces/work related area/meetingroom_small.ts	
+++ b/src/calculations/spaces/work related area/meetingroom_small.ts	
@@ -24,7 +24,7 @@ export default class WorkSmallMeetingroom extends MainSpace {
    * Calculates the area of the meeting room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const workTouchdown = new WorkTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const cellOffice = new CellOffice(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/work related area/minikitchenlounge.ts b/src/calculations/spaces/work related area/minikitchenlounge.ts
index 77bc4e7..9511f42 100644
--- a/src/calculations/spaces/work related area/minikitchenlounge.ts	
+++ b/src/calculations/spaces/work related area/minikitchenlounge.ts	
@@ -4,7 +4,7 @@ export default class MiniKitchenLounge extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType
   }
 
@@ -12,7 +12,7 @@ export default class MiniKitchenLounge extends MainSpace {
    * Calculates the area of the zone.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() + this.addedPeakArea()
   }
 }
diff --git a/src/calculations/spaces/work related area/multiroom.ts b/src/calculations/spaces/work related area/multiroom.ts
index 9037a33..761a9c8 100644
--- a/src/calculations/spaces/work related area/multiroom.ts	
+++ b/src/calculations/spaces/work related area/multiroom.ts	
@@ -9,7 +9,7 @@ export default class WorkMultiroom extends MainSpace {
    * Calculates the area of the multi room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const landscape = new Landscape(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const workTouchdown = new WorkTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/work related area/personalstorage.ts b/src/calculations/spaces/work related area/personalstorage.ts
index 8b4a5a8..55d04d1 100644
--- a/src/calculations/spaces/work related area/personalstorage.ts	
+++ b/src/calculations/spaces/work related area/personalstorage.ts	
@@ -10,7 +10,7 @@ export default class WorkPersonalStorage extends MainSpace {
    * Calculates the area of the personal storage
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const workTouchdown = new WorkTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const workDockin = new WorkDockin(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     const focusroom = new Focusroom(this.variables, this.config, this.customSpaceConstants, this.customConstants)
diff --git a/src/calculations/spaces/work related area/projectroom.ts b/src/calculations/spaces/work related area/projectroom.ts
index de02240..3766b56 100644
--- a/src/calculations/spaces/work related area/projectroom.ts	
+++ b/src/calculations/spaces/work related area/projectroom.ts	
@@ -5,7 +5,7 @@ export default class Projectroom extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     return this.variables.projectroomShare
   }
 
@@ -13,7 +13,7 @@ export default class Projectroom extends MainSpace {
    * Calculates the area of the project room.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType()
   }
 }
diff --git a/src/calculations/spaces/work related area/quietzone.ts b/src/calculations/spaces/work related area/quietzone.ts
index 12038f6..c85f457 100644
--- a/src/calculations/spaces/work related area/quietzone.ts	
+++ b/src/calculations/spaces/work related area/quietzone.ts	
@@ -5,7 +5,7 @@ export default class Quietzone extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     return this.variables.quietzoneShare
   }
 
@@ -13,7 +13,7 @@ export default class Quietzone extends MainSpace {
    * Calculates the area of the quiet zone.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType()
   }
 }
diff --git a/src/calculations/spaces/work related area/reception.ts b/src/calculations/spaces/work related area/reception.ts
index ee09266..1b27991 100644
--- a/src/calculations/spaces/work related area/reception.ts	
+++ b/src/calculations/spaces/work related area/reception.ts	
@@ -6,7 +6,7 @@ export default class WorkReception extends MainSpace {
    * Calculates the area of the reception.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToReception) {
       const sharedReception = new SharedReception(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() - sharedReception.calculateAreaExclCompensation()
diff --git a/src/calculations/spaces/work related area/special.ts b/src/calculations/spaces/work related area/special.ts
index e444f53..ff11125 100644
--- a/src/calculations/spaces/work related area/special.ts	
+++ b/src/calculations/spaces/work related area/special.ts	
@@ -5,7 +5,7 @@ export default class WorkSpecial extends MainSpace {
    * Calculates the area of the special rooms.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.variables.specialAreaOffice
   }
 }
diff --git a/src/calculations/spaces/work related area/toilet.ts b/src/calculations/spaces/work related area/toilet.ts
index 8c8881e..b492cce 100644
--- a/src/calculations/spaces/work related area/toilet.ts	
+++ b/src/calculations/spaces/work related area/toilet.ts	
@@ -4,7 +4,7 @@ export default class WorkToilet extends MainSpace {
   /**
    * Area per person excluding corridor
    */
-  areaPerPersonExcludingCorridor = (): number => {
+  areaPerPersonExcludingCorridor (): number {
     return this.spaceConstants.areaPerRole / this.spaceConstants.personsPerType * this.spaceConstants.unitsPerPerson!
   }
 
@@ -12,7 +12,7 @@ export default class WorkToilet extends MainSpace {
    * Calculates the area of the work toilet.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor()
   }
 }
diff --git a/src/calculations/spaces/work related area/touchdown.ts b/src/calculations/spaces/work related area/touchdown.ts
index 81e3ea2..ce259ea 100644
--- a/src/calculations/spaces/work related area/touchdown.ts	
+++ b/src/calculations/spaces/work related area/touchdown.ts	
@@ -6,7 +6,7 @@ export default class WorkTouchdown extends MainSpace {
    * This method computes the share of this workspace type
    * @returns {number}
    */
-  sharePerWorkspaceType = (): number => {
+  sharePerWorkspaceType (): number {
     // We need the shared touchdown share for the calculation of the work touchdown share
     const sharedTouchdown = new SharedTouchdown(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     return this.variables.touchdownShare - sharedTouchdown.sharePerWorkspaceType()
@@ -16,7 +16,7 @@ export default class WorkTouchdown extends MainSpace {
    * Calculates the area of touchdown. 0 if there is no need.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() * this.sharePerWorkspaceType() + this.addedPeakArea()
   }
 }
diff --git a/src/calculations/spaces/work related area/waitingzone.ts b/src/calculations/spaces/work related area/waitingzone.ts
index 52dd61c..870609f 100644
--- a/src/calculations/spaces/work related area/waitingzone.ts	
+++ b/src/calculations/spaces/work related area/waitingzone.ts	
@@ -6,7 +6,7 @@ export default class WorkWaitingZone extends MainSpace {
    * Calculates the area of the reception.
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     if (this.variables.accessToReception) {
       const sharedWaitingZone = new SharedWaitingZone(this.variables, this.config, this.customSpaceConstants, this.customConstants)
       return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() - sharedWaitingZone.calculateAreaExclCompensation()
diff --git a/src/calculations/spaces/work related area/wardrobe.ts b/src/calculations/spaces/work related area/wardrobe.ts
index 2daf40a..c7bd328 100644
--- a/src/calculations/spaces/work related area/wardrobe.ts	
+++ b/src/calculations/spaces/work related area/wardrobe.ts	
@@ -6,7 +6,7 @@ export default class WorkWardrobe extends MainSpace {
    * Calculates the area of the personal storage
    * @returns {number}
    */
-  calculateAreaExclCompensation = (): number => {
+  calculateAreaExclCompensation (): number {
     const sharedWardrobe = new SharedWardrobe(this.variables, this.config, this.customSpaceConstants, this.customConstants)
     return this.dimensionedAttendance() * this.areaPerPersonExcludingCorridor() - sharedWardrobe.calculateAreaExclCompensation()
   }