refactoring
refactoring code