Cleaning up the view