Tweaked style, reorder