finish variable name cleanup