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


Former-commit-id: 15dec6bc0e4e1eea2950ae8e836d768a883ca961
Former-commit-id: e50ab87dd957b95aa2cb6adf8a8c355755b2bc53
cschladetsch/KAI,cschladetsch/KAI,cschladetsch/KAI