Normalize var usage