javadoc cleanup, removed duplicated code