Finishing cleaning up the refactoring effort.