incremental progress on refactoring.