refactoring code
Refactor