Cleaned up the Views