Do some refactoring to allow for testability