Controlers refactoring.