are these formatting changes intentional?
we wrap lines at 120 chars, but you could argue that the extra lines here makes it easier to read