diff --git a/lib/coffee_script/command_line.js b/lib/coffee_script/command_line.js
index 0791f64a..e55cb66e 100644
--- a/lib/coffee_script/command_line.js
+++ b/lib/coffee_script/command_line.js
@@ -53,18 +53,7 @@
     }
     opts = this.options;
     return posix.cat(source).addCallback(function(code) {
-      if (opts.tokens) {
-        return puts(coffee.tokenize(code).join(' '));
-      }
-      if (opts.tree) {
-        return puts(coffee.tree(code).toString());
-      }
-      if (opts.run) {
-        return eval(coffee.compile(code));
-      }
-      if (opts.print) {
-        return puts(coffee.compile(code));
-      }
+      opts.tokens ? puts(coffee.tokenize(code).join(' ')) : opts.tree ? puts(coffee.tree(code).toString()) : opts.run ? eval(coffee.compile(code)) : opts.print ? puts(coffee.compile(code)) : null;
       return exports.compile_scripts();
     });
   };
diff --git a/src/command_line.coffee b/src/command_line.coffee
index 89340338..f59cbf05 100644
--- a/src/command_line.coffee
+++ b/src/command_line.coffee
@@ -62,10 +62,10 @@ exports.compile_scripts: ->
   return unless source: @sources.shift()
   opts: @options
   posix.cat(source).addCallback (code) ->
-    return puts coffee.tokenize(code).join(' ') if opts.tokens
-    return puts coffee.tree(code).toString()    if opts.tree
-    return eval coffee.compile code             if opts.run
-    return puts coffee.compile code             if opts.print
+    if      opts.tokens then puts coffee.tokenize(code).join(' ')
+    else if opts.tree   then puts coffee.tree(code).toString()
+    else if opts.run    then eval coffee.compile code
+    else if opts.print  then puts coffee.compile code
     exports.compile_scripts()