Minor Controller refactoring