Debugging var name cleanup