Revert "Revert "Fix checkstyle and javadocs errors""

This reverts commit 7e4b3f8fa8d7e0fdb05829c1c17fffeb94b127ce.