Refactoring

Refactor