minor cosmetic refactoring