Refactored parser into it’ sown class with delegate methods