Refactor: TargetList class