Refactoring and improvements in JavaDoc