Refactoring parsers