diff --git a/plugins/chruby/chruby.plugin.zsh b/plugins/chruby/chruby.plugin.zsh
index 44a2a660d..98e59b567 100644
--- a/plugins/chruby/chruby.plugin.zsh
+++ b/plugins/chruby/chruby.plugin.zsh
@@ -30,7 +30,9 @@ _ruby-install-installed() {
 
 # Simple definition completer for ruby-build
 if _ruby-build_installed; then
-    _ruby-build() { compadd $(ruby-build --definitions) }
+    _ruby-build() {
+        compadd $(ruby-build --definitions)
+    }
     compdef _ruby-build ruby-build
 fi
 
@@ -41,21 +43,21 @@ _source_from_omz_settings() {
     zstyle -s :omz:plugins:chruby path _chruby_path
     zstyle -s :omz:plugins:chruby auto _chruby_auto
 
-    if [[ -r ${_chruby_path} ]]; then
-        source ${_chruby_path}
+    if [[ -r "${_chruby_path}" ]]; then
+        source "${_chruby_path}"
     fi
 
-    if [[ -r ${_chruby_auto} ]]; then
-        source ${_chruby_auto}
+    if [[ -r "${_chruby_auto}" ]]; then
+        source "${_chruby_auto}"
     fi
 }
 
 function () {
-    local _chruby_homebrew_prefix=$(brew --prefix chruby) &> /dev/null
+    local _chruby_homebrew_prefix="$(brew --prefix chruby) &> /dev/null"
 
-    if _homebrew-installed && [ -r ${_chruby_homebrew_prefix} ] ; then
-        source ${_chruby_homebrew_prefix}/share/chruby/chruby.sh
-        source ${_chruby_homebrew_prefix}/share/chruby/auto.sh
+    if _homebrew-installed && [ -r "${_chruby_homebrew_prefix}" ] ; then
+        source "${_chruby_homebrew_prefix}/share/chruby/chruby.sh"
+        source "${_chruby_homebrew_prefix}/share/chruby/auto.sh"
     elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
         source /usr/local/share/chruby/chruby.sh
         source /usr/local/share/chruby/auto.sh
@@ -69,9 +71,9 @@ function ensure_chruby() {
 }
 
 function current_ruby() {
-    local _ruby="$(chruby |grep \* |tr -d '* ')"
-    if [[ $(chruby |grep -c \*) -eq 1 ]]; then
-        echo ${_ruby}
+    local _ruby="$(chruby | grep \* | tr -d '* ')"
+    if [[ -n "${_ruby}" ]]; then
+        echo "${_ruby}"
     else
         echo "system"
     fi