Cleanup messy whitespace