Refactoring for testability

Just follow along – it is a very valid point.