diff --git a/src/ui/activities/filetransfer/actions/mod.rs b/src/ui/activities/filetransfer/actions/mod.rs
index a814336..4f92258 100644
--- a/src/ui/activities/filetransfer/actions/mod.rs
+++ b/src/ui/activities/filetransfer/actions/mod.rs
@@ -85,8 +85,7 @@ impl FileTransferActivity {
             SelectedFileIndex::Many(files) => {
                 let files: Vec<&File> = files
                     .iter()
-                    .map(|x| self.local().get(*x)) // Usize to Option<File>
-                    .flatten()
+                    .filter_map(|x| self.local().get(*x)) // Usize to Option<File>
                     .collect();
                 SelectedFile::from(files)
             }
@@ -101,8 +100,7 @@ impl FileTransferActivity {
             SelectedFileIndex::Many(files) => {
                 let files: Vec<&File> = files
                     .iter()
-                    .map(|x| self.remote().get(*x)) // Usize to Option<File>
-                    .flatten()
+                    .filter_map(|x| self.remote().get(*x)) // Usize to Option<File>
                     .collect();
                 SelectedFile::from(files)
             }
@@ -129,8 +127,7 @@ impl FileTransferActivity {
             SelectedFileIndex::Many(files) => {
                 let files: Vec<&File> = files
                     .iter()
-                    .map(|x| self.found().as_ref().unwrap().get(*x)) // Usize to Option<File>
-                    .flatten()
+                    .filter_map(|x| self.found().as_ref().unwrap().get(*x)) // Usize to Option<File>
                     .collect();
                 SelectedFile::from(files)
             }
diff --git a/src/utils/crypto.rs b/src/utils/crypto.rs
index b90ffa2..9073be2 100644
--- a/src/utils/crypto.rs
+++ b/src/utils/crypto.rs
@@ -32,16 +32,16 @@ use magic_crypt::MagicCryptTrait;
 ///
 /// Crypt a string using AES128; output is returned as a BASE64 string
 pub fn aes128_b64_crypt(key: &str, input: &str) -> String {
-    let crypter = new_magic_crypt!(key.to_string(), 128);
-    crypter.encrypt_str_to_base64(input.to_string())
+    let crypter = new_magic_crypt!(key, 128);
+    crypter.encrypt_str_to_base64(input)
 }
 
 /// ### aes128_b64_decrypt
 ///
 /// Decrypt a string using AES128
 pub fn aes128_b64_decrypt(key: &str, secret: &str) -> Result<String, magic_crypt::MagicCryptError> {
-    let crypter = new_magic_crypt!(key.to_string(), 128);
-    crypter.decrypt_base64_to_string(secret.to_string())
+    let crypter = new_magic_crypt!(key, 128);
+    crypter.decrypt_base64_to_string(secret)
 }
 
 #[cfg(test)]