Controller refactoring proposal improved