Build and Test pass.  Refactoring code.