Refactoring

refactoring