refactor Javadoc definitions