Prefactoring

Prefactoring