Refactor the code
Refactor the code