Renamed methods with misleading name
Made lexer tokens use raw strings for regex
Merge pull request #12 from Markush2010/cleanup

Small cleanups