Refactoring: variable names