diff --git a/bitwarden-to-keepass.py b/bitwarden-to-keepass.py
index 8081b78..b72c1b9 100644
--- a/bitwarden-to-keepass.py
+++ b/bitwarden-to-keepass.py
@@ -6,7 +6,6 @@ import subprocess
 
 from argparse import ArgumentParser
 from typing import Dict, List, Optional
-from shlex import quote
 
 from pykeepass import PyKeePass, create_database
 from pykeepass.exceptions import CredentialsError
@@ -34,12 +33,12 @@ def bitwarden_to_keepass(args):
         logging.error(f'Wrong password for KeePass database: {e}')
         return
 
-    folders = subprocess.check_output(f'{quote(args.bw_path)} list folders --session {quote(args.bw_session)}', shell=True, encoding='utf8')
+    folders = subprocess.check_output([args.bw_path, 'list', 'folders', '--session', args.bw_session], encoding='utf8')
     folders = json.loads(folders)
     groups_by_id = load_folders(folders)
     logging.info(f'Folders done ({len(groups_by_id)}).')
 
-    items = subprocess.check_output(f'{quote(args.bw_path)} list items --session {quote(args.bw_session)}', shell=True, encoding='utf8')
+    items = subprocess.check_output([args.bw_path, 'list', 'items', '--session', args.bw_session], encoding='utf8')
     items = json.loads(items)
     logging.info(f'Starting to process {len(items)} items.')
     for item in items:
@@ -81,14 +80,12 @@ def bitwarden_to_keepass(args):
                 entry.set_custom_property(field['name'], field['value'])
 
             for attachment in bw_item.get_attachments():
-                attachment_tmp_path = f'/tmp/attachment/{attachment["fileName"]}'
-                attachment_path = subprocess.check_output(f'{quote(args.bw_path)} get attachment'
-                                                          f' --raw {quote(attachment["id"])} '
-                                                          f'--itemid {quote(bw_item.get_id())} '
-                                                          f'--output {quote(attachment_tmp_path)} --session {quote(args.bw_session)}', shell=True, encoding='utf8').rstrip()
-                attachment_id = kp.add_binary(open(attachment_path, 'rb').read())
+                attachment_raw = subprocess.check_output([
+                    args.bw_path, 'get', 'attachment', attachment['id'], '--raw', '--itemid', bw_item.get_id(),
+                    '--session', args.bw_session,
+                ])
+                attachment_id = kp.add_binary(attachment_raw)
                 entry.add_attachment(attachment_id, attachment['fileName'])
-                os.remove(attachment_path)
 
         except Exception as e:
             logging.warning(f'Skipping item named "{item["name"]}" because of this error: {repr(e)}')
@@ -128,6 +125,7 @@ def load_folders(folders) -> Dict[str, KPGroup]:
 
     return groups_by_id
 
+
 def check_args(args):
     if args.database_keyfile:
         if not os.path.isfile(args.database_keyfile) or not os.access(args.database_keyfile, os.R_OK):