Fix formatting in lexer
Merge branch 'working'