fix(trader): improved consolidation; readability improvements and cleanup
Merge pull request #29 from chester1000/trader-cleanup

fix(trader): improved consolidation; readability improvements and cleanup