Refactoring variable names