comtrollers refactoring