Refactoring.  Form encapsulation