cleaned-up some views