Initial Orderbook cleanup

Addresses first step of #777