Clean variable names a bit