[minor] Cosmetic
Manage the "on shelf/off shelf" state