Refactored the parser
Refactored the parser