Roster order, and small style tweak.