cleanup variable rename