some trivial cleanup. renamed variables.