a minor edit to method names, and removing some unneeded comments.