cleaned up views and model