Refactored some methods, deleted java docs