javadoc,refactor