minor line reordering