Refactor parsers