Clean-up variable names