Code cleanup
Merge pull request #232 from futures/DiamondOp

Code cleanup