Small Control  refactoring.