Refactor feature setup to use global feature func
Merge pull request #28 from chriserin/feature-refactor

Refactor feature setup to use global feature func