Cleanup and initial lexer for problem 54