Cleanup a few classes and change name/comments of a few methods
Merge branch 'refactor' of https://github.com/runtimeverification/javamop into refactor