small refactor
cleanup