diff --git a/.bash_env b/.bash_env
index 024eeae..550c2a2 100644
--- a/.bash_env
+++ b/.bash_env
@@ -38,8 +38,7 @@ nac () {
     alias denac='deactivate_node'
     alias deactivate_node='__denac'
     case $- in
-        *i*) __npm_completion \
-                   ; echo "Now using NODEENV node $NODE_VERSION (npm v$(npm --version))";;
+        *i*) __npm_completion; echo "Now using NODEENV node $NODE_VERSION (npm v$(npm --version))" ;;
     esac
 }
 export -f nac
@@ -56,7 +55,7 @@ complete -F __nac nac
 __denac () {
     ____denac
     case $- in
-        *i*) echo "Now using system node $(node --version) (npm v$(npm --version))";;
+        *i*) echo "Now using system node $(node --version) (npm v$(npm --version))" ;;
     esac
 }
 export -f __denac
@@ -83,8 +82,8 @@ nvm_load () {
     alias nvm='__nvm_mask'
     __nvm_mask () {
         case "$*" in
-            unload*) __nvm_unload;;
-            *) unalias nvm; nvm "$@"; alias nvm='__nvm_mask';;
+            unload*) __nvm_unload ;;
+            *) unalias nvm; nvm "$@"; alias nvm='__nvm_mask' ;;
         esac
         export NODE_VERSION=$(node --version)
     }
@@ -100,19 +99,18 @@ __nvm_load () {
     . ${HOME}/.nvm/nvm.sh &> /dev/null
     if [[ (-z $(nvm alias default)) && ($1 != "no-auto-lts") ]]; then
         case $- in
-            *i*) nvm install --lts;;
-            *) nvm install --lts &> /dev/null;;
+            *i*) nvm install --lts ;;
+            *) nvm install --lts &> /dev/null ;;
         esac
         local auto_lts=
     fi
     case $- in
-        *i*) __npm_completion;;
+        *i*) __npm_completion ;;
     esac
-    if [[ (! -v auto_lts) \
-              && ($(which node) = "${HOME}/.nvm/versions/"*) ]]; then
+    if [[ (! -v auto_lts) && ($(which node) = "${HOME}/.nvm/versions/"*) ]]; then
         export NODE_VERSION=$(node --version)
         case $- in
-            *i*) echo "Now using NVM node $NODE_VERSION (npm v$(npm --version))";;
+            *i*) echo "Now using NVM node $NODE_VERSION (npm v$(npm --version))" ;;
         esac
     fi
 }
@@ -121,7 +119,7 @@ export -f __nvm_load
 __nvm_unload () {
     ____nvm_unload
     case $- in
-        *i*) echo "Now using system node $NODE_VERSION (npm v$(npm --version))";;
+        *i*) echo "Now using system node $NODE_VERSION (npm v$(npm --version))" ;;
     esac
 }
 export -f __nvm_unload
diff --git a/run.sh b/run.sh
index 7096314..99468da 100755
--- a/run.sh
+++ b/run.sh
@@ -3,8 +3,8 @@
 run_embark () {
     local oldopts=""
     case $- in
-        *e*) oldopts="set -e";;
-        *) oldopts="set +e";;
+        *e*) oldopts="set -e" ;;
+        *) oldopts="set +e" ;;
     esac
     if [[ $(shopt -po history) = "set -o history" ]]; then
         oldopts="$oldopts; set -o history"
@@ -72,7 +72,7 @@ run_embark () {
     local -a cmd=( "$@" )
     case $1 in
         -V|--version|-h|--help|new|demo|build|run|blockchain|simulator|test|\
-            reset|graph|upload|version) cmd=( "embark" "$cmd" );;
+            reset|graph|upload|version) cmd=( "embark" "$cmd" ) ;;
     esac
 
     docker run \