Refactoring

Work in progress