Refactoring

just refactoring