minor style refactors