diff --git a/npm-run-completion.zsh b/npm-run-completion.zsh
index a64e239..c3389eb 100644
--- a/npm-run-completion.zsh
+++ b/npm-run-completion.zsh
@@ -1,5 +1,9 @@
 _npm_run_completion() {
+
+  # If we're on the run command
   if [ "${words[2]}" = "run" ]; then
+
+    # Look for a package.json file
     local filename="package.json"
     local dir=$PWD
     while [ ! -e "$dir/$filename" ]; do
@@ -8,10 +12,14 @@ _npm_run_completion() {
           break
         fi
     done
+
+    # If we have one, parse the scripts
     if [ ! "$dir" = "" ] && type node > /dev/null; then
       local options=("${(@f)$(node -e "var pkg = require('$dir/$filename'); pkg.scripts && Object.keys(pkg.scripts).forEach(function(script) { console.log(script.replace(':', '\\\:')+':$ '+pkg.scripts[script]) })")}")
       _describe 'values' options
     fi
+
+  # Fall back to default completion for all other npm commands
   else
     compadd -- $(COMP_CWORD=$((CURRENT-1)) \
     COMP_LINE=$BUFFER \