Java docs and formatting of more code