Minor refactoring with grouping variables.
Remove windows return lines.
Code refactoring.
Fix lexer bug.