chore

some small refactorings/updates/cleanups