Better comments
Refactor target to Target and target_list to TargetList