Clean myself up view 2