Rename variable and add comment