Rearranged methods and added some short Javadoc.
"Fixed" self-closing paragraphs in Javadoc.