diff --git a/commands b/commands
index 558bb3f..73ba0fb 100755
--- a/commands
+++ b/commands
@@ -164,7 +164,7 @@ case "$1" in
   $PLUGIN_COMMAND_PREFIX:info)
     [[ -z $2 ]] && dokku_log_fail "Please specify a name for the service"
     verify_service_name "$2"
-    service_info $2
+    service_info "$2"
     ;;
 
   $PLUGIN_COMMAND_PREFIX:list)
diff --git a/functions b/functions
index e211787..9552dd4 100755
--- a/functions
+++ b/functions
@@ -50,7 +50,7 @@ service_info() {
 }
 
 service_list() {
-  local SERVICES=$(ls $PLUGIN_DATA_ROOT 2> /dev/null)
+  local SERVICES=$(ls "$PLUGIN_DATA_ROOT" 2> /dev/null)
   if [[ -z $SERVICES ]]; then
     dokku_log_warn "There are no $PLUGIN_SERVICE services"
   else
diff --git a/install b/install
index f3b2bed..a32d3b8 100755
--- a/install
+++ b/install
@@ -2,11 +2,11 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$(dirname "$0")/config"
 
-if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q $PLUGIN_IMAGE_VERSION ; then
-  docker pull $PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION
+if ! docker images | grep -e "^$PLUGIN_IMAGE " | grep -q "$PLUGIN_IMAGE_VERSION" ; then
+  docker pull "$PLUGIN_IMAGE:$PLUGIN_IMAGE_VERSION"
 fi
 
 docker pull svendowideit/ambassador:latest
 
-mkdir -p $PLUGIN_DATA_ROOT || echo "Failed to create $PLUGIN_SERVICE directory"
-chown dokku:dokku $PLUGIN_DATA_ROOT
+mkdir -p "$PLUGIN_DATA_ROOT" || echo "Failed to create $PLUGIN_SERVICE directory"
+chown dokku:dokku "$PLUGIN_DATA_ROOT"