clean the TemplateCommand

And put my name on things purely because I can. If auf can do it, why
can't I?