Refactoring variables names for clarity