JavaDoccing and small refactorings
JavaDoccing