diff --git a/Sources/Errors.swift b/Sources/Errors.swift
index 4b7cafe..03f2bb1 100644
--- a/Sources/Errors.swift
+++ b/Sources/Errors.swift
@@ -70,15 +70,3 @@ open class SimpleErrorReporter: ErrorReporter {
   }
   
 }
-
-extension Range where Bound == String.Index {
-  internal static var unknown: Range {
-    return "".range
-  }
-}
-
-extension String {
-  var range: Range<String.Index> {
-    return startIndex..<endIndex
-  }
-}
diff --git a/Sources/Lexer.swift b/Sources/Lexer.swift
index caebac4..badad26 100644
--- a/Sources/Lexer.swift
+++ b/Sources/Lexer.swift
@@ -17,24 +17,19 @@ struct Lexer {
       return String(string[start..<end]).trim(character: " ")
     }
 
-    if string.hasPrefix("{{") {
+    if string.hasPrefix("{{") || string.hasPrefix("{%") || string.hasPrefix("{#") {
       let value = strip()
       let range = templateString.range(of: value, range: range) ?? range
       let line = templateString.rangeLine(range)
       let sourceMap = SourceMap(filename: templateName, line: line)
-      return .variable(value: value, at: sourceMap)
-    } else if string.hasPrefix("{%") {
-      let value = strip()
-      let range = templateString.range(of: value, range: range) ?? range
-      let line = templateString.rangeLine(range)
-      let sourceMap = SourceMap(filename: templateName, line: line)
-      return .block(value: value, at: sourceMap)
-    } else if string.hasPrefix("{#") {
-      let value = strip()
-      let range = templateString.range(of: value, range: range) ?? range
-      let line = templateString.rangeLine(range)
-      let sourceMap = SourceMap(filename: templateName, line: line)
-      return .comment(value: value, at: sourceMap)
+
+      if string.hasPrefix("{{") {
+        return .variable(value: value, at: sourceMap)
+      } else if string.hasPrefix("{%") {
+        return .block(value: value, at: sourceMap)
+      } else if string.hasPrefix("{#") {
+        return .comment(value: value, at: sourceMap)
+      }
     }
 
     let line = templateString.rangeLine(range)
@@ -57,7 +52,6 @@ struct Lexer {
     while !scanner.isEmpty {
       if let text = scanner.scan(until: ["{{", "{%", "{#"]) {
         if !text.1.isEmpty {
-          let line = templateString.rangeLine(scanner.range)
           tokens.append(createToken(string: text.1, at: scanner.range))
         }
 
@@ -65,7 +59,6 @@ struct Lexer {
         let result = scanner.scan(until: end, returnUntil: true)
         tokens.append(createToken(string: result, at: scanner.range))
       } else {
-        let line = templateString.rangeLine(scanner.range)
         tokens.append(createToken(string: scanner.content, at: scanner.range))
         scanner.content = ""
       }
@@ -120,7 +113,6 @@ class Scanner {
     }
 
     content = ""
-    range = "".range
     return ""
   }