Formatting changes to match my modern ordering/spacing preferences