This should simplify refactoring and allow testing