Fix variable formatting