A bit of style cleanup