Code cleanup and checkstyle corrections (JavaDocs, etc.)