Cleaning up views and template files