2 files changed, 6 insertions, 9 deletions
diff --git a/src/main/com/jantuomi/tunkki/Tunkki.java b/src/main/com/jantuomi/tunkki/Tunkki.java
index a4120a8..ad0efa1 100644
--- a/src/main/com/jantuomi/tunkki/Tunkki.java
+++ b/src/main/com/jantuomi/tunkki/Tunkki.java
@@ -11,12 +11,10 @@ import com.jantuomi.tunkki.exception.TunkkiError;
 import com.jantuomi.tunkki.repl.Repl;
 import org.kohsuke.args4j.CmdLineException;
 import org.kohsuke.args4j.CmdLineParser;
-import sun.awt.X11.XToolkit;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
-import java.util.Scanner;
 
 public class Tunkki {
 
@@ -42,12 +40,12 @@ public class Tunkki {
         Collections.reverse(sequence);
 
         List<Token> trees = Parser.getInstance().parse(sequence);
-        if (CommandLineArgumentContainer.getInstance().isDebugModeActive()) {
+        if (CommandLineArgumentContainer.getInstance().isAstModeActive()) {
             Parser.getInstance().printAllTrees(trees);
         }
 
         List<ASTNode> nodes = ASTGenerator.getInstance().generate(trees);
-        if (CommandLineArgumentContainer.getInstance().isDebugModeActive()) {
+        if (CommandLineArgumentContainer.getInstance().isAstModeActive()) {
             ASTGenerator.getInstance().printAllTrees(nodes);
         }
 
diff --git a/src/main/com/jantuomi/tunkki/core/CommandLineArgumentContainer.java b/src/main/com/jantuomi/tunkki/core/CommandLineArgumentContainer.java
index 5266c6f..4b2d0f8 100644
--- a/src/main/com/jantuomi/tunkki/core/CommandLineArgumentContainer.java
+++ b/src/main/com/jantuomi/tunkki/core/CommandLineArgumentContainer.java
@@ -28,9 +28,8 @@ public class CommandLineArgumentContainer {
     @Option(name="-i", usage="Run in interactive mode.")
     public boolean interactiveModeActive = false;
 
-
-    @Option(name="-d", usage="Display verbose debug output.")
-    public boolean debugModeActive = false;
+    @Option(name="-d", usage="Display AST output (for debugging purposes).")
+    public boolean astModeActive = false;
 
     public static CommandLineArgumentContainer getInstance() {
         return instance;
@@ -40,8 +39,8 @@ public class CommandLineArgumentContainer {
         return interactiveModeActive;
     }
 
-    public boolean isDebugModeActive() {
-        return debugModeActive;
+    public boolean isAstModeActive() {
+        return astModeActive;
     }
 
     public String getSourceFileContents() {