Refactoring code
Refactoring code