More cosmetics, re-ordering, and reformatting.