Update to match guidelines