convert const to var
improve context