Refactoring code to produce easier to overide controls.