More cosmetics, re-ordering, and reformatting.
More cosmetics, re-ordering, and reformatting.


Former-commit-id: f1d4e722aa670376dc16affd96287c21234d53e3
Former-commit-id: 6638e9903ccef9983fb8ef0e4bd121fbac93d3ec
cschladetsch/KAI,cschladetsch/KAI,cschladetsch/KAI