cleaned up the templates