Add matrix addition/subtraction and minor style cleanup