Cleaning up a bit further with the templates.