diff --git a/ast/lex.go b/ast/lex.go
index 3031cab..6f672e5 100644
--- a/ast/lex.go
+++ b/ast/lex.go
@@ -162,14 +162,13 @@ func lex(input string) *Token {
 
         // comment case
         case ';':
+            i = matchLineEnd(i)
             start_pos = i + 1
-            i = matchLineEnd(start_pos)
         }
 
         if needs_alloc {
             needs_alloc = false
             if (i < 0) {
-                // TODO: Maybe not overload this.
                 start_pos = i
                 goto error
             }
@@ -186,8 +185,6 @@ func lex(input string) *Token {
     return ret
 
 error:
-    // TODO: Hook into error module
-    // TODO: Finalize and GC alloced tokens
     if start_pos == -1 {
         log.Log(log.ERR,
                 "Unmatched string delimiter in input. discarding.",