Safeway rebounds with sharper focus