Refactored code to make it more readable