diff --git a/src/nicethings.rkt b/src/nicethings.rkt
index de9bab6..d9b8ef0 100644
--- a/src/nicethings.rkt
+++ b/src/nicethings.rkt
@@ -8,13 +8,13 @@
 ;; ------------------------------------------------
 ;; Constants
 ;; ------------------------------------------------
-(define help-command-1 "help")
-(define help-command-2 "--help")
-(define help-command-3 "-h")
-(define init-command "init")
-(define ls-command "ls")
-(define rm-command "rm")
-(define add-command "add")
+(define command-help-1 "help")
+(define command-help-2 "--help")
+(define command-help-3 "-h")
+(define command-init "init")
+(define command-ls "ls")
+(define command-rm "rm")
+(define command-add "add")
 (define program-name "nicethings")
 (define program-file (string-append "." program-name))
 (define program-path (path->string (build-path (find-system-path 'home-dir) program-file)))
@@ -30,13 +30,13 @@
         (format (string-append "Error: Too many arguments." newline
                                "Try running '~a ~a' for more information.")
                 program-name
-                help-command-1)
+                command-help-1)
 
         'error-incorrect-usage
         (format (string-append "Error: Incorrect usage." newline
                                "Try running '~a ~a' for more information.")
                 program-name
-                help-command-1)
+                command-help-1)
 
         'couldnt-find-file
         (format (string-append "Error: Couldn't find ~a" newline
@@ -46,7 +46,7 @@
                 program-path
                 program-path
                 program-name
-                init-command)
+                command-init)
 
         'error-something-exists
         (format "Error: It looks like ~a already exists." program-path)
@@ -56,7 +56,7 @@
                                "Try running '~a ~a'.")
                 program-path
                 program-name
-                init-command)
+                command-init)
 
         'error-item-not-found
         "Error: Item not found."
@@ -230,29 +230,29 @@
       "Commands:" newline
       "  No command - Displays a random nicething from a random user." newline
       (format "  ~a - Creates a file in ~a, which allows you to contribute to the town-wide list of nicethings."
-              init-command
+              command-init
               program-path) newline
-      (format "  ~a - Adds a nicething to your list." add-command) newline
-      (format "  ~a - Prints a numbered list of the nicethings you've added." ls-command) newline
-      (format "  ~a - Removes a nicething from your list." rm-command)
+      (format "  ~a - Adds a nicething to your list." command-add) newline
+      (format "  ~a - Prints a numbered list of the nicethings you've added." command-ls) newline
+      (format "  ~a - Removes a nicething from your list." command-rm)
       double-newline
 
       "Examples:" newline
       (format "  ~a" program-name) newline
-      (format "  ~a ~a" program-name init-command) newline
-      (format "  ~a ~a \"You are wonderful\"" program-name add-command) newline
-      (format "  ~a ~a" program-name ls-command) newline
-      (format "  ~a ~a 2" program-name rm-command))))
+      (format "  ~a ~a" program-name command-init) newline
+      (format "  ~a ~a \"You are wonderful\"" program-name command-add) newline
+      (format "  ~a ~a" program-name command-ls) newline
+      (format "  ~a ~a 2" program-name command-rm))))
 
 (define (process-args vectorof-args)
   (match vectorof-args
-    [(or (vector (== help-command-1))
-         (vector (== help-command-2))
-         (vector (== help-command-3))) (help)]
-    [(vector (== ls-command))          (ls)]
-    [(vector (== init-command))        (init)]
-    [(vector (== add-command) a)       (add a)]
-    [(vector (== rm-command)  a)       (rm a)]
+    [(or (vector (== command-help-1))
+         (vector (== command-help-2))
+         (vector (== command-help-3))) (help)]
+    [(vector (== command-ls))          (ls)]
+    [(vector (== command-init))        (init)]
+    [(vector (== command-add) a)       (add a)]
+    [(vector (== command-rm)  a)       (rm a)]
     [_                                 (random-message)]
     [(vector _ ...)                    (displayln-messages-ref 'error-incorrect-usage)]))