tidy
tidy
refactor to make testing easier
refactor to make testing easier