cleaned up views and templates