Make the variable more meaningful and fix the comments