JavaDoc errors reduced