Tidying up and fixing Lexer.cpp