Fleaning-up view 2