Rafactoring

Rafactorings