Refactored code to make it more clean