diff --git a/src/main.rs b/src/main.rs
index 5115f8b..f847cdd 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,7 @@
 #![feature(advanced_slice_patterns, slice_patterns, box_patterns)]
 extern crate getopts;
 extern crate linefeed;
+extern crate itertools;
 #[macro_use]
 extern crate lazy_static;
 #[macro_use]
diff --git a/src/robo_lang/mod.rs b/src/robo_lang/mod.rs
index 736990c..76a0043 100644
--- a/src/robo_lang/mod.rs
+++ b/src/robo_lang/mod.rs
@@ -1,5 +1,4 @@
-extern crate itertools;
-use self::itertools::Itertools;
+use itertools::Itertools;
 
 use language::{ProgrammingLanguageInterface, EvalOptions, ReplOutput, TokenError};
 
diff --git a/src/schala_lang/mod.rs b/src/schala_lang/mod.rs
index 86cda20..b092003 100644
--- a/src/schala_lang/mod.rs
+++ b/src/schala_lang/mod.rs
@@ -1,3 +1,4 @@
+use itertools::Itertools;
 use language::{ProgrammingLanguageInterface, EvalOptions, TraceArtifact, ReplOutput};
 
 mod parsing;
@@ -20,7 +21,9 @@ impl ProgrammingLanguageInterface for Schala {
     let mut output = ReplOutput::default();
     let tokens = parsing::tokenize(input);
     if options.debug_tokens {
-      output.add_artifact(TraceArtifact::new("tokens", format!("{:?}", tokens)));
+      let token_string = tokens.iter().map(|t| format!("{:?}<{}>", t.token_type, t.offset)).join(", ");
+      output.add_artifact(TraceArtifact::new("tokens", format!("{:?}", token_string)));
+
     }
 
     {
diff --git a/src/schala_lang/parsing.rs b/src/schala_lang/parsing.rs
index d1ef562..e61cdc6 100644
--- a/src/schala_lang/parsing.rs
+++ b/src/schala_lang/parsing.rs
@@ -1,9 +1,7 @@
-extern crate itertools;
-
+use itertools::Itertools;
 use std::collections::HashMap;
 use std::rc::Rc;
 use std::iter::{Enumerate, Peekable};
-use self::itertools::Itertools;
 use std::vec::IntoIter;
 use std::str::Chars;
 
@@ -71,8 +69,8 @@ lazy_static! {
 
 #[derive(Debug)]
 pub struct Token {
-  token_type: TokenType,
-  offset: usize,
+  pub token_type: TokenType,
+  pub offset: usize,
 }
 
 impl Token {