diff --git a/app/src/main/java/me/zobrist/tichucounter/Extensions.kt b/app/src/main/java/me/zobrist/tichucounter/Extensions.kt
new file mode 100644
index 0000000..09a0370
--- /dev/null
+++ b/app/src/main/java/me/zobrist/tichucounter/Extensions.kt
@@ -0,0 +1,10 @@
+package me.zobrist.tichucounter
+
+fun Int.isMultipleOf5(): Boolean
+{
+    return (this % 5) == 0
+}
+
+fun Int.isMultipleOf100(): Boolean {
+    return (this % 100) == 0
+}
\ No newline at end of file
diff --git a/app/src/main/java/me/zobrist/tichucounter/History.kt b/app/src/main/java/me/zobrist/tichucounter/History.kt
index 15da7af..117fbb0 100644
--- a/app/src/main/java/me/zobrist/tichucounter/History.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/History.kt
@@ -1,8 +1,5 @@
-@file:Suppress("unused")
-
 package me.zobrist.tichucounter
 
-
 class History {
     private var scores: ArrayList<Round> = ArrayList()
 
diff --git a/app/src/main/java/me/zobrist/tichucounter/Round.kt b/app/src/main/java/me/zobrist/tichucounter/Round.kt
index 3f0b7f6..e3165dd 100644
--- a/app/src/main/java/me/zobrist/tichucounter/Round.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/Round.kt
@@ -22,17 +22,13 @@ class Round() : Serializable {
     }
 
     private fun calculateOtherScore(score: Int): Int {
-        if (isMultipleOf100(score)) {
+        if (score.isMultipleOf100() && score != 0) {
             return 0
         }
         return 100 - (score % 100)
     }
 
-    private fun isMultipleOf100(score: Int): Boolean {
-        return (score / 100) >= 1 && (score % 100) == 0
-    }
-
     fun isValidRound(): Boolean {
-        return (scoreA % 5 == 0) && (scoreB % 5 == 0) && ((scoreA + scoreB) % 100 == 0)
+        return (scoreA.isMultipleOf5()) && scoreB.isMultipleOf5() && (scoreA + scoreB).isMultipleOf100()
     }
 }
\ No newline at end of file