Refactor Facade