More formatting fixes

Not sure about the last section Starting with "Context" - the `if (state->request` is chopped off