There's a lot of weird reformatting in this PR :)