Minor changes, rearrange two lines