Improved javadoc based on review's feedback