Better javadocs