minor refactor (reduce checkstyle warnings and javadoc tweaks)