diff --git a/Sources/7zFileInfo.swift b/Sources/7zFileInfo.swift
index 1a920472..2748a0c8 100644
--- a/Sources/7zFileInfo.swift
+++ b/Sources/7zFileInfo.swift
@@ -60,7 +60,10 @@ class SevenZipFileInfo {
                 let names = bitReader.bytes(count: propertySize - 1)
                 var nextFile = 0
                 var nextName = 0
-                for i in stride(from: 0, to: names.count, by: 2) { // TODO: Understand what is going on here.
+                for i in stride(from: 0, to: names.count, by: 2) {
+                    // End of file name is identified by two consequent NULL bytes.
+                    // TODO: In Swift 4.0 we may try to convert dat to UTF16LE first,
+                    //  and then split it into strings?
                     if names[i] == 0 && names[i + 1] == 0 {
                         files[nextFile].name = String(data: Data(bytes: names[nextName..<i]),
                                                       encoding: .utf16LittleEndian)
diff --git a/Tests/7zTests.swift b/Tests/7zTests.swift
index a012b796..0c882243 100644
--- a/Tests/7zTests.swift
+++ b/Tests/7zTests.swift
@@ -104,9 +104,9 @@ class SevenZipTests: XCTestCase {
             let entries = try SevenZipContainer.info(container: testData)
 
             XCTAssertEqual(entries.count, 6)
-            
+
             for entry in entries where entry.name == "test_create/test4.answer" {
-                XCTAssertEqual((entry as? SevenZipEntryInfo)?.isAnti, true)
+                XCTAssertEqual(entry.isAnti, true)
             }
         #endif
     }
@@ -157,10 +157,10 @@ class SevenZipTests: XCTestCase {
             XCTAssertEqual(entries.count, 6)
 
             for entry in entries {
-                XCTAssertNotNil((entry as? SevenZipEntryInfo)?.creationTime)
-                XCTAssertNotNil((entry as? SevenZipEntryInfo)?.accessTime)
+                XCTAssertNotNil(entry.creationTime)
+                XCTAssertNotNil(entry.accessTime)
                 // Just in case...
-                XCTAssertNotNil((entry as? SevenZipEntryInfo)?.modificationTime)
+                XCTAssertNotNil(entry.modificationTime)
             }
         #endif
     }
@@ -300,9 +300,8 @@ class SevenZipTests: XCTestCase {
 
         let testData = try Data(contentsOf: testURL, options: .mappedIfSafe)
         let entries = try SevenZipContainer.open(container: testData)
-        
+
         XCTAssertEqual(entries.isEmpty, true)
     }
 
-
 }
diff --git a/Tests/TarTests.swift b/Tests/TarTests.swift
index fb351698..fc03b55a 100644
--- a/Tests/TarTests.swift
+++ b/Tests/TarTests.swift
@@ -161,7 +161,7 @@ class TarTests: XCTestCase {
 
         let testData = try Data(contentsOf: testURL, options: .mappedIfSafe)
         let entries = try TarContainer.open(container: testData)
-        
+
         XCTAssertEqual(entries.isEmpty, true)
     }
 
diff --git a/Tests/ZipTests.swift b/Tests/ZipTests.swift
index 716bc550..2aa34128 100644
--- a/Tests/ZipTests.swift
+++ b/Tests/ZipTests.swift
@@ -185,7 +185,7 @@ class ZipTests: XCTestCase {
 
         let testData = try Data(contentsOf: testURL, options: .mappedIfSafe)
         let entries = try ZipContainer.open(container: testData)
-        
+
         XCTAssertEqual(entries.isEmpty, true)
     }