Removed list requirement from targets and controls
Removed redundant code
Fixed bug