Clean up more whitespace