diff --git a/src/test/kotlin/file/FilePositionTrackerTest.kt b/src/test/kotlin/file/FilePositionTrackerTest.kt
index 358ffe0..0f77544 100644
--- a/src/test/kotlin/file/FilePositionTrackerTest.kt
+++ b/src/test/kotlin/file/FilePositionTrackerTest.kt
@@ -15,9 +15,8 @@ class FilePositionTrackerTest {
 
     private lateinit var trackerUnderTest: FilePositionTracker
 
-    private fun createFilePosition(lineNumber: Int, columnNumber: Int): FilePosition {
-        return FilePosition(FILE_NAME, lineNumber, columnNumber)
-    }
+    private fun createFilePosition(lineNumber: Int, columnNumber: Int) =
+        FilePosition(FILE_NAME, lineNumber, columnNumber)
 
     private fun assertTrackerPositionEquals(expectedPosition: FilePosition) {
         assertThat(trackerUnderTest.currentPosition()).isEqualTo(expectedPosition)
diff --git a/src/test/kotlin/parser/LispParserTest.kt b/src/test/kotlin/parser/LispParserTest.kt
index b0667d8..34202c8 100644
--- a/src/test/kotlin/parser/LispParserTest.kt
+++ b/src/test/kotlin/parser/LispParserTest.kt
@@ -27,15 +27,8 @@ import token.TokenFactory.BadCharacterException
 @TestInstance(PER_CLASS)
 class LispParserTest {
 
-    private fun createLispParser(input: String): LispParser {
-        val stringInputStream = createInputStreamFromString(input)
-        return LispParser(stringInputStream, "testFile")
-    }
-
-    private fun createIOExceptionThrowingLispParser(): LispParser {
-        val stringInputStream = createIOExceptionThrowingInputStream()
-        return LispParser(stringInputStream, "testFile")
-    }
+    private fun createLispParser(input: String) = LispParser(createInputStreamFromString(input), "testFile")
+    private fun createIOExceptionThrowingLispParser() = LispParser(createIOExceptionThrowingInputStream(), "testFile")
 
     @Test
     fun `EOF check is true with no input`() {
@@ -200,7 +193,7 @@ class LispParserTest {
         } catch (e: BadCharacterException) {
             val message = e.message
 
-            assertThat(message).isNotEmpty();
+            assertThat(message).isNotEmpty()
             assertThat(e.severity).isEqualTo(ERROR)
         }
     }