Fix checkstyle warnings and docblocks typo