Controller's refactoring