diff --git a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy
index 4239fa534c..1418947cc7 100644
--- a/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy
+++ b/core-groovy-modules/core-groovy/src/main/groovy/com/baeldung/file/ReadFile.groovy
@@ -10,13 +10,14 @@ class ReadFile {
     int readFileLineByLine(String filePath) {
         File file = new File(filePath)
         def line, noOfLines = 0;
+
         file.withReader { reader ->
-            while ((line = reader.readLine())!=null)
-            {
+            while ((line = reader.readLine()) != null) {
                 println "${line}"
                 noOfLines++
             }
         }
+
         return noOfLines
     }
 
@@ -26,9 +27,7 @@ class ReadFile {
      * @return
      */
     List<String> readFileInList(String filePath) {
-        File file = new File(filePath)
-        def lines = file.readLines()
-        return lines
+        return new File(filePath).readLines()
     }
 
     /**
@@ -37,9 +36,7 @@ class ReadFile {
      * @return
      */
     String readFileString(String filePath) {
-        File file = new File(filePath)
-        String fileContent = file.text
-        return fileContent
+        return new File(filePath).text
     }
 
     /**
@@ -48,9 +45,7 @@ class ReadFile {
      * @return
      */
     String readFileStringWithCharset(String filePath) {
-        File file = new File(filePath)
-        String utf8Content = file.getText("UTF-8")
-        return utf8Content
+        return new File(filePath).getText("UTF-8")
     }
 
     /**
@@ -59,49 +54,44 @@ class ReadFile {
      * @return
      */
     byte[] readBinaryFile(String filePath) {
-        File file = new File(filePath)
-        byte[] binaryContent = file.bytes
-        return binaryContent
+        return new File(filePath).bytes
     }
-    
+
     /**
      * More Examples of reading a file 
      * @return
      */
     def moreExamples() {
-        
+
         //with reader with utf-8
         new File("src/main/resources/utf8Content.html").withReader('UTF-8') { reader ->
             def line
-            while ((line = reader.readLine())!=null) { 
+            while ((line = reader.readLine()) != null) {
                 println "${line}"
             }
         }
-        
-        //collect api
-        def list = new File("src/main/resources/fileContent.txt").collect {it}
-                
-        //as operator
+
+        // collect api
+        def list = new File("src/main/resources/fileContent.txt").collect { it }
+
+        // as operator
         def array = new File("src/main/resources/fileContent.txt") as String[]
-              
-        //eachline  
-        new File("src/main/resources/fileContent.txt").eachLine { line ->
-            println line
-        }
-        
+
+        // eachline  
+        new File("src/main/resources/fileContent.txt").eachLine { println it }
+
         //newInputStream with eachLine
-        def is = new File("src/main/resources/fileContent.txt").newInputStream()
-        is.eachLine {
-            println it
+
+        // try-with-resources automatically closes BufferedInputStream resource
+        try (def inputStream = new File("src/main/resources/fileContent.txt").newInputStream()) {
+            inputStream.eachLine { println it }
         }
-        is.close()
-        
-        //withInputStream
+
+        // withInputStream
         new File("src/main/resources/fileContent.txt").withInputStream { stream ->
             stream.eachLine { line ->
                 println line
             }
         }
     }
-
-}
\ No newline at end of file
+}
diff --git a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy
index da1dfc10ba..87cfc79761 100644
--- a/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy
+++ b/core-groovy-modules/core-groovy/src/test/groovy/com/baeldung/file/ReadFileUnitTest.groovy
@@ -1,71 +1,76 @@
 package com.baeldung.file
 
 import spock.lang.Specification
-import spock.lang.Ignore
 
 class ReadFileUnitTest extends Specification {
 
     ReadFile readFile
 
-    void setup () {
+    void setup() {
         readFile = new ReadFile()
     }
 
-    def 'Should return number of lines in File using ReadFile.readFileLineByLine given filePath' () {
+    def 'Should return number of lines in File using ReadFile.readFileLineByLine given filePath'() {
         given:
-            def filePath = "src/main/resources/fileContent.txt"
+        def filePath = "src/main/resources/fileContent.txt"
+
         when:
-            def noOfLines = readFile.readFileLineByLine(filePath)
+        def noOfLines = readFile.readFileLineByLine(filePath)
+
         then:
-            noOfLines
-            noOfLines instanceof Integer
-            assert noOfLines, 3
-    }
-    
-    def 'Should return File Content in list of lines using ReadFile.readFileInList given filePath' () {
-        given:
-            def filePath = "src/main/resources/fileContent.txt"
-        when:
-            def lines = readFile.readFileInList(filePath)
-        then:
-            lines
-            lines instanceof List<String>
-            assert lines.size(), 3
-    }
-    
-    def 'Should return file content in string using ReadFile.readFileString given filePath' () {
-        given:
-            def filePath = "src/main/resources/fileContent.txt"
-        when:
-            def fileContent = readFile.readFileString(filePath)
-        then:
-            fileContent
-            fileContent instanceof String
-            fileContent.contains("""Line 1 : Hello World!!!
-Line 2 : This is a file content.
-Line 3 : String content""")
-    
+        noOfLines
+        noOfLines instanceof Integer
+        noOfLines == 3
     }
 
-    def 'Should return UTF-8 encoded file content in string using ReadFile.readFileStringWithCharset given filePath' () {
+    def 'Should return File Content in list of lines using ReadFile.readFileInList given filePath'() {
         given:
-            def filePath = "src/main/resources/utf8Content.html"
+        def filePath = "src/main/resources/fileContent.txt"
+
         when:
-            def encodedContent = readFile.readFileStringWithCharset(filePath)
+        def lines = readFile.readFileInList(filePath)
+
         then:
-            encodedContent
-            encodedContent instanceof String
+        lines
+        lines instanceof List<String>
+        lines.size() == 3
     }
-    
-    def 'Should return binary file content in byte array using ReadFile.readBinaryFile given filePath' () {
+
+    def 'Should return file content in string using ReadFile.readFileString given filePath'() {
         given:
-            def filePath = "src/main/resources/sample.png"
+        def filePath = "src/main/resources/fileContent.txt"
+
         when:
-            def binaryContent = readFile.readBinaryFile(filePath)
+        def fileContent = readFile.readFileString(filePath)
+
         then:
-            binaryContent
-            binaryContent instanceof byte[]
-            binaryContent.length == 329
+        fileContent
+        fileContent instanceof String
+        fileContent.contains(["Line 1 : Hello World!!!", "Line 2 : This is a file content.", "Line 3 : String content"].join("\r\n"))
     }
-    
-}
\ No newline at end of file
+
+    def 'Should return UTF-8 encoded file content in string using ReadFile.readFileStringWithCharset given filePath'() {
+        given:
+        def filePath = "src/main/resources/utf8Content.html"
+
+        when:
+        def encodedContent = readFile.readFileStringWithCharset(filePath)
+
+        then:
+        encodedContent
+        encodedContent instanceof String
+    }
+
+    def 'Should return binary file content in byte array using ReadFile.readBinaryFile given filePath'() {
+        given:
+        def filePath = "src/main/resources/sample.png"
+
+        when:
+        def binaryContent = readFile.readBinaryFile(filePath)
+
+        then:
+        binaryContent
+        binaryContent instanceof byte[]
+        binaryContent.length == 329
+    }
+}