refactoring of controllers holder