JavaDoc adedd refactoring