further tidy of variable names