refactored picks and algo
Merge pull request #18 from Pouncealot/master

refactored picks and algo