fix .gitignore
Rename a variable for clarity.
Rename a member function and drop its argument, since the data passed there is duplicative of what we have elsewhere.