Refactoring: minor cosmetic changes.