cleaning up the controllers some more