diff --git a/src/config/datastore.rs b/src/config/datastore.rs
index afa44453..109ce2e9 100644
--- a/src/config/datastore.rs
+++ b/src/config/datastore.rs
@@ -79,18 +79,8 @@ pub fn save_config(config: &SectionConfigData) -> Result<(), Error> {
 
 // shell completion helper
 pub fn complete_datastore_name() -> Vec<String> {
-
-    let data = match config() {
-        Ok(data) => data,
+    match config() {
+        Ok(data) => data.sections.iter().map(|(id,_)| id.to_string()).collect(),
         Err(_) => return vec![],
-    };
-
-    //let test = data.sections
-    let mut res = vec![];
-
-    for (id, _) in data.sections {
-        res.push(id);
     }
-
-    res
 }