small refactoring in controllers and deps update