clean it up view 1