[#81]Improve javadoc comments