small refactoring to lean out the controllers