Code cleanup and fixed indentation in lexer rules.