Remove case sensitivity from the state machine
Simplify a bit of the parser