refactoring - renaming variables