changed some comments and variable names