Renaming some variables, and adding comments