Formattng + a few nitpicks of previous patches.