more cleanup; adding helpers; cleaning up ops controller.