Clean up view
Clean up view