Clean variable names