Formatting

cosmetic touch-up, spacing, consistency, ordering, nicer test