javadoc and code quality improvement