Quick clean up on a few of the style fields organization