Improve javadocs (Simple -> not grouped)