some cleanup on the views