fix comments and variable names