+ WIP: further work on controller cleanup