variable names refactoring