Cleaning up varnames