Formattting fixes missed in the previous commit and forgotten to squash