Refactoring

Refactored