address review comments
javadoc