refactoring market state and handling of deltas