Cleaned up the views and models