Use builtin choices methods
Merge pull request #2 from adepue/master

Use builtin choices methods