refactoring 1

refactoring 1