Refactor JavaDoc