Renaming a few more methods and removing some obvious comments.