Bring var formatting in line with conventions