cleanup
small refactor