Templates -> Template
cleaning up