I tried to stay consistent with the existing code in this file, if you feel I should reformat it, I could do that in a separate commit.