Rearranged methods
Removing redundant java docs