rename variable
fix comments