Finished JavaDocs. Did some refactoring.