whitespace and rearrange