removed the comments and fixed variable names that were the topic of the...

... ignored comments on the last pull request