General clean up and updated JavaDocs.