Minor refactoring. ready for release.