diff --git a/launch-dedicated.sh b/launch-dedicated.sh
index ca8425f..de427d4 100755
--- a/launch-dedicated.sh
+++ b/launch-dedicated.sh
@@ -8,27 +8,26 @@
 
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
-source ${TEMPLATE_ROOT}/mod.config
+. "${TEMPLATE_ROOT}/mod.config"
 
 MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
 if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
 	MOD_SEARCH_PATHS="${TEMPLATE_PATHS},./mods"
 fi
 
+NAME="${Name:-"Dedicated Server"}"
 LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
-
-Name="${Name:-"Dedicated Server"}"
-Mod="${Mod:-"${MOD_ID}"}"
-ListenPort="${ListenPort:-"1234"}"
-ExternalPort="${ExternalPort:-"1234"}"
-AdvertiseOnline="${AdvertiseOnline:-"True"}"
-EnableSingleplayer="${EnableSingleplayer:-"False"}"
-Password="${Password:-""}"
+LISTEN_PORT="${ListenPort:-"1234"}"
+EXTERNAL_PORT="${ExternalPort:-"1234"}"
+ADVERTISE_ONLINE="${AdvertiseOnline:-"True"}"
+ENABLE_SINGLE_PLAYER="${EnableSingleplayer:-"False"}"
+PASSWORD="${Password:-""}"
 
 cd engine
+
 while true; do
-     MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Server.exe Game.Mod=$Mod \
-     Server.Name="$Name" Server.ListenPort=$ListenPort Server.ExternalPort=$ExternalPort \
-     Server.AdvertiseOnline=$AdvertiseOnline \
-     Server.EnableSingleplayer=$EnableSingleplayer Server.Password=$Password
+     MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Server.exe Game.Mod="${LAUNCH_MOD}" \
+     Server.Name="${NAME}" Server.ListenPort="${LISTEN_PORT}" Server.ExternalPort="${EXTERNAL_PORT}" \
+     Server.AdvertiseOnline="${ADVERTISE_ONLINE}" \
+     Server.EnableSingleplayer="${ENABLE_SINGLE_PLAYER}" Server.Password="${PASSWORD}"
 done
diff --git a/launch-game.sh b/launch-game.sh
index 1c613de..760116d 100755
--- a/launch-game.sh
+++ b/launch-game.sh
@@ -2,7 +2,7 @@
 
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
-source ${TEMPLATE_ROOT}/mod.config
+. "${TEMPLATE_ROOT}/mod.config"
 
 MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
 if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
diff --git a/utility.sh b/utility.sh
index 1d823e9..6ca7b3a 100755
--- a/utility.sh
+++ b/utility.sh
@@ -5,7 +5,7 @@
 
 TEMPLATE_LAUNCHER=$(python -c "import os; print(os.path.realpath('$0'))")
 TEMPLATE_ROOT=$(dirname "${TEMPLATE_LAUNCHER}")
-source ${TEMPLATE_ROOT}/mod.config
+. "${TEMPLATE_ROOT}/mod.config"
 
 MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods"
 if [ "${INCLUDE_DEFAULT_MODS}" = "True" ]; then
@@ -15,4 +15,4 @@ fi
 LAUNCH_MOD="${Mod:-"${MOD_ID}"}"
 
 cd engine
-MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Utility.exe ${LAUNCH_MOD} $@
+MOD_SEARCH_PATHS="${MOD_SEARCH_PATHS}" mono --debug OpenRA.Utility.exe "${LAUNCH_MOD}" "$@"