while this style of formatting `var`s has lost its proponents, not sure we should change all that in this commit. I'd recommend making formatting changes in a separate commit.