Reorder commands in a more natural order