Refactoring controls