Minor renames of variables and changes in comments