Pulled the category selection into helper
Merge pull request #1 from dpequeen/Refactoring

Pulled the category selection into helper