Improvements and Javadoc, PMD/Checkstyle compliance