Simplify formatting and sort these. No functionality changed.