Refactored the code
Refactored the code