fix(facility): review fixes