More code cleaning
More code cleaning
Merge branch 'master' of https://github.com/saltlab/javis