Controllers refactor.