If you have a moment can you pull out the formatting changes into a separate commit (just to reduce the diffs a bit). I'm fine if you submit that change without my review.