Small cleanup 3

Cleanup up some more code, made Majava class more OO.