Minor comment deletion, rename, and bug fix