Cleans for pull: renames var, removes unused code, adds comment