Improve javadocs.
Remove duplication of docs