Polish code
Added 'ArrowChoice' utilities