Whitespace-only cleanup to Matrix2

Just does some line wrapping, whitespace improvements of the GSOC work.

Could go further, but this seemed an improvement.