Updated comments and variable names.