clean up varable names