More changes to variable formatting