Refactoring

TBD