Edit comments and identifier renaming.
Dropped unused property assignment.