targetedcommands: affirm refactor