few small refactors and reformats