some more minor style refactors