Cleaner Variable Declarations; Merge Lexer Back