Refactored code
Refactored code