#JC-1309 JavaDocs improvement, small refactoring