Cleaning up views, trimmimg some fat