Refactoring, Lexer update, StatementBlocks
Updated Lexer