Code rearrange

Minor update.