Variable name changes and comments