Group views, more cleanup.