small refactor / cleanup