Initial Orderbook cleanup
Orderbook cleanup
Merge pull request #778 from achamely/master

Initial Orderbook cleanup