Refactor to simplify
test
test