clean up variable names