Fix javadoc and remove code in comment block