cleanup variable names