cleaned up view