Made a few changes to lexical analyzer. Also removed some 'optimizations'