diff --git a/cleancov b/cleancov
index bdf241d..67d1391 100755
--- a/cleancov
+++ b/cleancov
@@ -6,6 +6,6 @@
 #
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${DIR}/envcov.sh
+source "${DIR}/envcov.sh"
 
 LCOV --zerocounters -d "${OBJ_DIR}"
diff --git a/envcov.sh b/envcov.sh
index 7644205..538f6ed 100644
--- a/envcov.sh
+++ b/envcov.sh
@@ -5,16 +5,16 @@
 #
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${DIR}/env.sh
+source "${DIR}/env.sh"
 
 # Change the report name if you like:
 LCOV_INFO=Coverage.info
 
 XCODECOVERAGE_PATH="${SRCROOT}/XcodeCoverage"
 LCOV_PATH="${XCODECOVERAGE_PATH}/lcov-1.10/bin"
-OBJ_DIR=${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}
+OBJ_DIR="${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}"
 
 # Fix for the new LLVM-COV that requires gcov to have a -v paramter
 LCOV() {
-	${LCOV_PATH}/lcov $* --gcov-tool ${XCODECOVERAGE_PATH}/llvm-cov-wrapper.sh
+	"${LCOV_PATH}/lcov" "$@" --gcov-tool "${XCODECOVERAGE_PATH}/llvm-cov-wrapper.sh"
 }
diff --git a/exportenv.sh b/exportenv.sh
index ac480eb..d96c398 100755
--- a/exportenv.sh
+++ b/exportenv.sh
@@ -5,4 +5,4 @@
 #
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-export | egrep '( BUILT_PRODUCTS_DIR)|(CURRENT_ARCH)|(OBJECT_FILE_DIR_normal)|(SRCROOT)|(OBJROOT)' > ${DIR}/env.sh
+export | egrep '( BUILT_PRODUCTS_DIR)|(CURRENT_ARCH)|(OBJECT_FILE_DIR_normal)|(SRCROOT)|(OBJROOT)' > "${DIR}/env.sh"
diff --git a/getcov b/getcov
index 5a7d842..363c480 100755
--- a/getcov
+++ b/getcov
@@ -6,7 +6,7 @@
 #
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source ${DIR}/envcov.sh
+source "${DIR}/envcov.sh"
 
 remove_old_report()
 {
diff --git a/llvm-cov-wrapper.sh b/llvm-cov-wrapper.sh
index b0e642f..76696a5 100755
--- a/llvm-cov-wrapper.sh
+++ b/llvm-cov-wrapper.sh
@@ -9,5 +9,5 @@ if [ "$1" = "-v" ]; then
     echo "llvm-cov-wrapper 4.2.1"
     exit 0
 else
-    /usr/bin/gcov $*
+    /usr/bin/gcov "$@"
 fi