Refactoring of code as we near a 1.0 release.