Reformat list, make order look better