Update Makefile and make the lexer a little cleaner