JavaDoc and refactoring, #35