diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 065ef9d241..2d7bd73487 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -38,12 +38,15 @@ class Hooks {
 	 */
 	public static function login( $params ) {
 	
+		// Manually initialise Filesystem{} singleton with correct 
+		// fake root path, in order to avoid fatal webdav errors
 		\OC\Files\Filesystem::init( $params['uid'] . '/' . 'files' . '/' );
 	
 		$view = new \OC_FilesystemView( '/' );
 
 		$util = new Util( $view, $params['uid'] );
 		
+		// Check files_encryption infrastructure is ready for action
 		if ( ! $util->ready() ) {
 			
 			\OC_Log::write( 'Encryption library', 'User account "' . $params['uid'] . '" is not ready for encryption; configuration started', \OC_Log::DEBUG );
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index e3ffacabc9..136c776045 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -133,12 +133,6 @@ class Crypt {
          * @note see also OCA\Encryption\Util->isEncryptedPath()
          */
 	public static function isCatfile( $content ) {
-	
-		if ( !$content ) {
-		
-			return false;
-			
-		}
 		
 		$noPadding = self::removePadding( $content );
 		
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 355ffb90ef..52bc74db27 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -69,11 +69,6 @@ class Util {
 	//// DONE: add method to fetch legacy key
 	//// DONE: add method to decrypt legacy encrypted data
 	
-	//// TODO: add method to encrypt all user files using new system
-	//// TODO: add method to decrypt all user files using new system
-	//// TODO: add method to encrypt all user files using old system
-	//// TODO: add method to decrypt all user files using old system
-	
 	
 	// Admin UI:
 	
@@ -93,7 +88,6 @@ class Util {
 	
 	// Integration testing:
 	
-	//// TODO: test new encryption with webdav
 	//// TODO: test new encryption with versioning
 	//// TODO: test new encryption with sharing
 	//// TODO: test new encryption with proxies
@@ -278,7 +272,7 @@ class Util {
 						// will eat server resources :(
 						if ( 
 							Keymanager::getFileKey( $this->view, $this->userId, $file ) 
-							&& Crypt::isCatfile( $filePath )
+							&& Crypt::isCatfile( $data )
 						) {
 						
 							$found['encrypted'][] = array( 'name' => $file, 'path' => $filePath );
@@ -391,7 +385,6 @@ class Util {
 			
 			}
 			
-			// FIXME: Legacy recrypting here isn't finished yet
 			// Encrypt legacy encrypted files
 			if ( 
 				! empty( $legacyPassphrase ) 
@@ -437,6 +430,11 @@ class Util {
 		
 	}
 	
+	/**
+	 * @brief Return important encryption related paths
+	 * @param string $pathName Name of the directory to return the path of
+	 * @return string path
+	 */
 	public function getPath( $pathName ) {
 	
 		switch ( $pathName ) {