Rearrange code layout (minor)