Refactoring things again to not only make more sense, but to be testable as well.