Clean this up a little.

Needs name as well to differentiate torgets