Small controls refactoring