variable name cleanup