Add Facade + tidy