cosmetic + jdoc refactoring