Modified some comments and variable names.