var name cleanup