Refactor, simplify lexer, remove token types