Cleanup variable names