Removed unneeded brackets and updated some JavaDocs