Refactored parser!