Working on JavaDocs and refactoring code.