refactoring code
refactoring code