Some minor cleaning up.
Merge branch 'master' of github.com:opencor/opencor