diff --git a/all/modules/install/hugo-install.func b/all/modules/install/hugo-install.func
index 40bf3ce..93033df 100755
--- a/all/modules/install/hugo-install.func
+++ b/all/modules/install/hugo-install.func
@@ -22,6 +22,9 @@ EFILE=""
 # c - use 'hugoe' as the install command for extended version otherwise 'hugo' will launch extended version
 # f - force download/overwrite of same version
 
+declare OPTION
+declare OPTARG
+declare OPTIND
 
 while getopts 'ecf' OPTION; do
   case "$OPTION" in
@@ -74,36 +77,36 @@ if [ -z "$NEW_VERSION" ]; then
   exit 1
 fi
 
-if ! [ $NEW_VERSION = $CUR_VERSION ] || [ $FORCE = true ]; then
+[[ $NEW_VERSION = $CUR_VERSION ]] && [[ $FORCE = false ]]  && echo Latest version already installed at $BIN_PATH && return 0
 
-  pushd /tmp/ > /dev/null
+pushd /tmp/ > /dev/null
 
-  URL=$(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest \
-  | grep "browser_download_url.*hugo.*._Linux-${ARCHES[$ARCH]}\.tar\.gz" \
-  | \
-  if [ $EXTENDED = true ]; then
-    grep "_extended"
-  else
-    grep -v "_extended"
-  fi \
-  | cut -d ":" -f 2,3 \
-  | tr -d \" \
-  )
+URL=$(curl -u $GITHUB_USER:$GITHUB_TOKEN -s https://api.github.com/repos/gohugoio/hugo/releases/latest \
+| grep "browser_download_url.*hugo.*._Linux-${ARCHES[$ARCH]}\.tar\.gz" \
+| \
+if [ $EXTENDED = true ]; then
+  grep "_extended"
+else
+  grep -v "_extended"
+fi \
+| cut -d ":" -f 2,3 \
+| tr -d \" \
+)
 
-  echo $URL
+echo $URL
 
-  echo "Installing version $NEW_VERSION `[ $EXTENDED == true ] && echo "Extended"`  "
-  echo "This machine's architecture is $ARCH"
-  echo "Downloading Tarball $URL"
+echo "Installing version $NEW_VERSION `[ $EXTENDED == true ] && echo "Extended"`  "
+echo "This machine's architecture is $ARCH"
+echo "Downloading Tarball $URL"
 
-   wget --user=-u $GITHUB_USER --password=$GITHUB_TOKEN -q $URL
+ wget --user=-u $GITHUB_USER --password=$GITHUB_TOKEN -q $URL
 
-   TARBALL=$(basename $URL)
-  # TARBALL="$(find . -name "*Linux-${ARCHES[$ARCH]}.tar.gz" 2>/dev/null)"
-  echo Expanding Tarball, $TARBALL
-  tar -xzf $TARBALL hugo
+ TARBALL=$(basename $URL)
+# TARBALL="$(find . -name "*Linux-${ARCHES[$ARCH]}.tar.gz" 2>/dev/null)"
+echo Expanding Tarball, $TARBALL
+tar -xzf $TARBALL hugo
 
-  chmod +x hugo
+chmod +x hugo
 
 if [ -w $BIN_DIR ]; then
   echo "Installing hugo to $BIN_DIR"
@@ -115,25 +118,22 @@ fi
 
 rm $TARBALL
 
-  popd > /dev/null
+popd > /dev/null
 
-  echo Installing hugo `[ $EXTENDED == true ] && echo "extended"` as hugo$EFILE
+echo Installing hugo `[ $EXTENDED == true ] && echo "extended"` as hugo$EFILE
 
-  BIN_PATH="$(which hugo$EFILE)"
-  if [ -z "$BIN_PATH" ]; then
+BIN_PATH="$(which hugo$EFILE)"
+
+if [ -z "$BIN_PATH" ]; then
   printf "WARNING: Installed Hugo Binary in $BIN_DIR is not in your environment path\nPATH=$PATH\n"
 else
   if [ "$BIN_DIR/hugo$EFILE" != "$BIN_PATH" ]; then
-  echo "WARNING: Just installed Hugo binary hugo$EFILE to, $BIN_DIR , conflicts with existing Hugo in $BIN_PATH"
-  echo "add $BIN_DIR to path and delete $BIN_PATH"
-else
-  echo "--- Installation Confirmation ---"
-  printf "New Hugo binary version at $BIN_PATH is\n $($BIN_PATH version)\n"
+    echo "WARNING: Just installed Hugo binary hugo$EFILE to, $BIN_DIR , conflicts with existing Hugo in $BIN_PATH"
+    echo "add $BIN_DIR to path and delete $BIN_PATH"
+  else
+    echo "--- Installation Confirmation ---"
+    printf "New Hugo binary version at $BIN_PATH is\n $($BIN_PATH version)\n"
   fi
 fi
 
-else
-  echo Latest version already installed at $BIN_PATH
-fi
-
 }