Refactor for Improved Testability™