Add comment reordering