New try with javadocs.
Removed things not needed by javadocs