Clean up whitespace for upstream