A bit of a style cleanup