Clean myself up view 3