more cleaning of variable names