cleaned up some views