ParserUtil refactoring