var name cleanup.