update code comments, rename methods