Refactorization

Refactorization