cleanup variable name