edit out and javadoc