General code cleanup of civicrm.views.inc