cleaning up code
Merge branch 'andrew' of https://github.com/jeche/OPS into andrew