OrderbookFactory - code cleanup