diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt
index 7cae544..cc79e1e 100644
--- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalCustomTimer.kt
@@ -3,7 +3,7 @@ package be.ugent.sel.studeez.data.local.models.timer_functional
 class FunctionalCustomTimer(studyTime: Int): FunctionalTimer(studyTime) {
 
     override fun tick() {
-        if (time.getTime() == 0) {
+        if (time.time == 0) {
             view = "Done!"
         } else {
             time.minOne()
@@ -11,6 +11,6 @@ class FunctionalCustomTimer(studyTime: Int): FunctionalTimer(studyTime) {
     }
 
     override fun hasEnded(): Boolean {
-        return time.getTime() == 0
+        return time.time == 0
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt
index ef0bf03..4a990f4 100644
--- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalPomodoroTimer.kt
@@ -9,19 +9,19 @@ class FunctionalPomodoroTimer(
     private var isInBreak = false
 
     override fun tick() {
-        if (time.getTime() == 0 && breaksRemaining == 0){
+        if (time.time == 0 && breaksRemaining == 0){
             view = "Done!"
             return
         }
 
-        if (time.getTime() == 0) {
+        if (time.time == 0) {
             if (isInBreak) {
                 breaksRemaining--
                 view = "Focus! ($breaksRemaining breaks remaining)"
-                time.setTime(studyTime)
+                time.time = studyTime
             } else {
                 view = "Take a break!"
-                time.setTime(breakTime)
+                time.time =breakTime
             }
             isInBreak = !isInBreak
         }
@@ -29,6 +29,6 @@ class FunctionalPomodoroTimer(
     }
 
     override fun hasEnded(): Boolean {
-        return breaksRemaining == 0 && time.getTime() == 0
+        return breaksRemaining == 0 && time.time == 0
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt
index e6965ab..5d06207 100644
--- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/FunctionalTimer.kt
@@ -2,16 +2,12 @@ package be.ugent.sel.studeez.data.local.models.timer_functional
 
 abstract class FunctionalTimer(initialValue: Int) {
     protected val time: Time = Time(initialValue)
-    protected var view: String = "Focus"
+    var view: String = "Focus"
 
     fun getHoursMinutesSeconds(): HoursMinutesSeconds {
         return time.getAsHMS()
     }
 
-    fun getViewString(): String {
-        return view
-    }
-
     abstract fun tick()
 
     abstract fun hasEnded(): Boolean
diff --git a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt
index ff89516..ec7702d 100644
--- a/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/data/local/models/timer_functional/Time.kt
@@ -2,7 +2,7 @@ package be.ugent.sel.studeez.data.local.models.timer_functional
 
 class Time(initialTime: Int) {
 
-    private var time = initialTime
+    var time = initialTime
 
     fun minOne() {
         time--
@@ -12,14 +12,6 @@ class Time(initialTime: Int) {
         time++
     }
 
-    fun setTime(newTime: Int) {
-        time = newTime
-    }
-
-    fun getTime(): Int {
-        return time
-    }
-
     fun getAsHMS(): HoursMinutesSeconds {
         val hours: Int = time / (60 * 60)
         val minutes: Int = (time / (60)) % 60
diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
index d69470e..05a7d3d 100644
--- a/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
+++ b/app/src/main/java/be/ugent/sel/studeez/screens/session/SessionScreen.kt
@@ -50,7 +50,7 @@ private fun Timer(viewModel: SessionViewModel = hiltViewModel()) {
             fontSize = 80.sp
         )
         Text(
-            text = viewModel.getTimer().getViewString(),
+            text = viewModel.getTimer().view,
             modifier = Modifier.fillMaxWidth(),
             textAlign = TextAlign.Center,
             fontWeight = FontWeight.Light,
diff --git a/app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt b/app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt
index 81730e5..567ef18 100644
--- a/app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt
+++ b/app/src/test/java/be/ugent/sel/studeez/TimeUnitTest.kt
@@ -32,7 +32,7 @@ class TimeUnitTest {
     @Test
     fun getTime() {
         Assert.assertEquals(
-            time.getTime(),
+            time.time,
             seconds + minutes * 60 + hours * 60 * 60
         )
     }
@@ -41,7 +41,7 @@ class TimeUnitTest {
     fun minOne() {
         time.minOne()
         Assert.assertEquals(
-            time.getTime(),
+            time.time,
             (seconds + minutes * 60 + hours * 60 * 60) - 1
         )
     }
@@ -50,7 +50,7 @@ class TimeUnitTest {
     fun plusOne() {
         time.plusOne()
         Assert.assertEquals(
-            time.getTime(),
+            time.time,
             (seconds + minutes * 60 + hours * 60 * 60) + 1
         )
     }
@@ -62,7 +62,7 @@ class TimeUnitTest {
             time.minOne()
         }
         Assert.assertEquals(
-            time.getTime(),
+            time.time,
             (seconds + minutes * 60 + hours * 60 * 60) - n
         )
     }
@@ -74,7 +74,7 @@ class TimeUnitTest {
             time.plusOne()
         }
         Assert.assertEquals(
-            time.getTime(),
+            time.time,
             (seconds + minutes * 60 + hours * 60 * 60) + n
         )
     }