Refactor parser to be more regex-based