Refactor to use #select
Merge pull request #11 from stevenhaddox/refactor_again

Refactor to use #select