refactoring: little makeup cleanup