Upstream: Minor formatting