Template clean up :shit: