Rename some variables and remove unused comments

Rename some variables and remove unused comments