diff --git a/run-with-podman.sh b/run-with-podman.sh
index 42084d7..59a0e26 100755
--- a/run-with-podman.sh
+++ b/run-with-podman.sh
@@ -102,7 +102,7 @@ function parse_input () {
 parse_input "${@}"
 
 # Sanitize filename for unique container name
-CLEAN="${FILE_ACTIVE//_/}" && CLEAN="${CLEAN// /_}" &&
+CLEAN="${FILE_ACTIVE//_/}" && CLEAN="${CLEAN// /}" &&
 CLEAN="${CLEAN//[^a-zA-Z0-9_]/}" && CLEAN="${CLEAN,,}"
 
 # Allow container access to the pwd
@@ -140,27 +140,27 @@ elif [[ $MODE == "1" ]]; then
     if podman container exists "atom-${CLEAN}-persistent"; then
         echo "Using existing container!"
         podman exec "atom-${CLEAN}-persistent" \
-        /bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE}"
+        /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE}"
     else
         if [[ -n $MASK_DIR ]]; then
             podman run \
             -it \
             --systemd="${SYSTEMD}" \
             --name "atom-${CLEAN}-persistent" \
-            -v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \
-            -v "{FILE_ACTIVE_PATH}/${MASK_DIR}" \
-            -w "{FILE_ACTIVE_PATH}" \
+            -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
+            -v "${FILE_ACTIVE_PATH}/${MASK_DIR}" \
+            -w "${FILE_ACTIVE_PATH}" \
             "${IMAGE}" \
-            /bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}"
+            /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
         else
             podman run \
             -it \
             --systemd="${SYSTEMD}" \
             --name "atom-${CLEAN}-persistent" \
-            -v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \
-            -w "{FILE_ACTIVE_PATH}" \
+            -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
+            -w "${FILE_ACTIVE_PATH}" \
             "${IMAGE}" \
-            /bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}"
+            /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
         fi
     fi
 # Recreate persistent container
@@ -175,19 +175,19 @@ elif [[ $MODE == "2" ]]; then
         -it \
         --systemd="${SYSTEMD}" \
         --name "atom-${CLEAN}-persistent" \
-        -v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \
-        -v "{FILE_ACTIVE_PATH}/${MASK_DIR}" \
-        -w "{FILE_ACTIVE_PATH}" \
+        -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
+        -v "${FILE_ACTIVE_PATH}/${MASK_DIR}" \
+        -w "${FILE_ACTIVE_PATH}" \
         "${IMAGE}" \
-        /bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}"
+        /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
     else
         podman run \
         -it \
         --systemd="${SYSTEMD}" \
         --name "atom-${CLEAN}-persistent" \
-        -v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \
-        -w "{FILE_ACTIVE_PATH}" \
+        -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
+        -w "${FILE_ACTIVE_PATH}" \
         "${IMAGE}" \
-        /bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}"
+        /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
     fi
 fi