Refactor some winnow business
Some formatting
Use make instead of new
Merge pull request #1 from kyledj/refactored-chaff

Refactor some winnow business
Merge pull request #2 from schmichael/refactored-chaff

Refactored chaff