Refactor TargetParser