Add Javadoc an fix checkstyle