Using map instead of serial branches for small lexer cleanup / optimization
using const integers for types instead of strings
modified parser