more out of date comment removal, more verbose variable names