Refactor accessory