diff --git a/aqme/cmin.py b/aqme/cmin.py
index 11684abf..b25560bd 100644
--- a/aqme/cmin.py
+++ b/aqme/cmin.py
@@ -320,8 +320,9 @@ def compute_cmin(self, file):
                     if len(self.args.constraints_atoms) >= 1 or len(self.args.constraints_dist) >= 1 or len(self.args.constraints_angle) >= 1 or len(self.args.constraints_dihedral) >= 1:
                         complex_ts = True
                     name_init = mol.GetProp('_Name')
+                    name_file_out = '_'.join(name_init.split())
                     mol, energy, cmin_valid = xtb_opt_main(
-                        f'{self.name}_conf_{i}',
+                        name_file_out,
                         dup_data,
                         dup_data_idx,
                         self,
diff --git a/aqme/csearch/crest.py b/aqme/csearch/crest.py
index 706ef39e..a6bc95f1 100644
--- a/aqme/csearch/crest.py
+++ b/aqme/csearch/crest.py
@@ -163,7 +163,7 @@ def xtb_opt_main(
         if self.args.xtb_keywords is not None:
             for keyword in self.args.xtb_keywords.split():
                 if keyword == "--ohess":
-                    command1.remove("--opt ")
+                    command1.remove("--opt")
                 command1.append(keyword)
 
         xtb_out1 = f'{os.path.dirname(Path(xyzoutxtb1))}/{os.path.basename(Path(xyzoutxtb1)).split(".xyz")[0]}'
@@ -215,7 +215,7 @@ def xtb_opt_main(
             if self.args.xtb_keywords is not None:
                 for keyword in self.args.xtb_keywords.split():
                     if keyword == "--ohess":
-                        command2.remove("--opt ")
+                        command2.remove("--opt")
                     command2.append(keyword)
 
             xtb_out2 = f'{os.path.dirname(Path(xyzoutxtb2))}/{os.path.basename(Path(xyzoutxtb2)).split(".xyz")[0]}'
@@ -247,7 +247,7 @@ def xtb_opt_main(
             if self.args.xtb_keywords is not None:
                 for keyword in self.args.xtb_keywords.split():
                     if keyword == "--ohess":
-                        command.remove("--opt ")
+                        command.remove("--opt")
                     command.append(keyword)
             xtb_out1 = f'{os.path.dirname(Path(xyzin))}/{os.path.basename(Path(xyzin)).split(".xyz")[0]}'
             run_command(command, f"{xtb_out1}_xtb1.out")
@@ -265,7 +265,7 @@ def xtb_opt_main(
                     comm_xtb = f"export OMP_STACKSIZE={self.args.stacksize} && export OMP_NUM_THREADS={self.args.nprocs},1 \
                     && xtb {xyzin} --opt -c {charge} --uhf {int(mult) - 1} {self.args.xtb_keywords} >> {xtb_out1}_xtb1.out"
                     if " --ohess " in comm_xtb:
-                        comm_xtb.remove("--opt ")
+                        comm_xtb.remove("--opt")
                 subprocess.call(comm_xtb, shell=False)
                 os.rename(str(dat_dir) + "/xtbopt.xyz", xyzoutxtb1)
             except FileNotFoundError:
diff --git a/aqme/qdescp.py b/aqme/qdescp.py
index f6fc7f41..9290c42c 100644
--- a/aqme/qdescp.py
+++ b/aqme/qdescp.py
@@ -176,7 +176,7 @@ def __init__(self, **kwargs):
                 else:
                     self.args.log.write("x  WARNING! No column with SMILES information found in the input CSV file.")
                 if len(smiles_list) > 0:
-                    mols = [Chem.MolFromSmiles(smiles) for smiles in smiles_list if Chem.MolFromSmiles(smiles) is not None]#JDJAJKSHDKHA
+                    mols = [Chem.MolFromSmiles(smiles) for smiles in smiles_list if Chem.MolFromSmiles(smiles) is not None]
                     if len(mols) > 0:
                         mcs = rdFMCS.FindMCS(mols)
                         if mcs is not None: