Cosmetic changes to variable names