Easy: comment and variable name fixes