updating the names of a few variables and comments