Cleaned up view some