Clean up whitespace issues