Cleanup, new proofs of commutativity and associativity