Fix extra whitespace and line breaks