Cleanup lexer.rb some more