Refactored code to have more explicit names