Cleaned up some views