minor reordering