Wand: Moved duplicate responsibility out of Target class