tested refactor
cleanup