minor changes to comments and variable names