Updated parser and lexer to maintain current parsing state.
Code cleanup
Standardized string objects