JavaDoc improvement and formatting issues