Some view cleanups