Small code rearrange.