refactored code
refactored code