Reformat to match the upstream code style