minor coding style refactorings