Reorder & reformat a bit.