Refactored Parsing