Tweak list ordering
Tweak formatting