Some minor cosmetic refactorings