Reworks javadoc to be simpler and more direct