more arbitrage refactoring