Refactor ParserTarget