Cleans up piece selection code

Converts the response toUpperCase() to eliminate extra switch case
statements.
Merge branch 'dev'