Stop using single var