javadoc and name refactoring.