clean up of code
Merge branch 'master' of github.com:pommier/mxexpsim