Clean up choices iteration
Updated varaibles for choices iteration
Merge pull request #156 from topless/patch-1

Clean up choices iteration