add quick refactoring in the controller