Update code comments and rename variable