Reformat var declarations