I finished the refactor. All tests pass and the module is complete.