update variable names, cleanup comments