add javadoc and clean dictionary