cleanup
test refactoring