diff --git a/transfer_service/tape_client.py b/transfer_service/tape_client.py
index 37f0dec7043f980004087de7a50b1010413e4370..65c91c282725b1fd894360580887a4bd5486cf00 100644
--- a/transfer_service/tape_client.py
+++ b/transfer_service/tape_client.py
@@ -87,14 +87,13 @@ class TapeClient(object):
         else:
             exitCode = stdout.channel.recv_exit_status()
             if not exitCode:
-                result = stdout.readlines()[0].rstrip('\n')
-                self.HSMFilesystemList = result.splitlines()
+                self.HSMFilesystemList = [ el.rstrip('\n') for el in stdout.readlines() ]
                 return self.HSMFilesystemList.copy()
             else:
                 raise TapeClientException(cmd, exitCode, stderr)
 
     def getHSMFilesystemFreeSpace(self, HSMFilesystem):
-        "Returns the free space in bytes for a given HSM filesystem."
+        """Returns the free space in bytes for a given HSM filesystem."""
         cmd = f"{self.DSMDF} -detail {HSMFilesystem} | grep \"Free Size\" | awk '{{ print $3 }}'"
         try:
             stdin, stdout, stderr = self.client.exec_command(cmd)