in the future, would be nice to split up the reformatting and the changes into separate PRs or at least separate commits so it's easier to review and the history preserve more information.