continue refactor of Facade