more variables names cleaning