Controls Refactoring