rearrange, whitespace cleanup