Style guide fix up