Renames variables
Removes superfluous comment
Adds changelog entry