Change variable name and whitespace, as discussed in pull request #559.