Refactor to make it easier to test