Controls refactoring