fixed comments and variable names