@Jonathanwolfe beautify PR

I couldn't add my own commit on top of the PR, so created a new branch.

Full conversation here: #2176