renaming, added some javadoc comment.