Cleaning up view stuff