Fleaning-up view 1