scripts/cleanup in rvm-1.0.6 vs scripts/cleanup in rvm-1.0.7

@@ -1,31 +1,55 @@
 #!/usr/bin/env bash
 rvm_base_except="selector"
-source "$rvm_scripts_path/base"
+source "$rvm_path/scripts/base"
 
 usage() {
-  printf "Usage: 'rvm cleanup {all,archives,repos,sources,logs}'\n"
-  printf "       Cleans up the directory tree for the specified item.\n"
-  exit 1
+  printf "
+
+  Usage:
+
+    rvm cleanup {all,archives,repos,sources,logs}
+
+  Description:
+
+    Cleans up the directory tree for the specified item.
+"
+return 0
 }
 
 cleanup() {
+  local cleanup_type current_path
+
   for cleanup_type in $1; do
+
     eval "current_path=\"\$rvm_${cleanup_type}_path\""
+
     if [[ -n "$current_path" && -d "$current_path" && "$current_path" != "/" ]]; then
-      "$rvm_scripts_path"/log "info" "Cleaning up rvm directory '$current_path'"
+
+      "$rvm_path/scripts/log" "info" \
+        "Cleaning up rvm directory '$current_path'"
+
       rm -rf "$current_path"/* >/dev/null 2>&1
+
     fi
-  done; unset cleanup_type current_path
+
+  done
+
+  return 0
 }
 
 # Exit when there is no argument.
-[[ -z "$1" ]] && usage
+if [[ -z "${1:-""}" ]] ; then
+  usage
+fi
 
 case "$1" in
   all)      cleanup "archives repo src log" ;;
   archives) cleanup "archives" ;;
   repos)    cleanup "repo" ;;
   sources)  cleanup "src" ;;
   logs)     cleanup "log" ;;
-  *)        usage ;;
+  help)     usage ;;
+  *)        usage ; exit 1;;
 esac
+
+exit $?