Rearrange debug statements