Further refactoring in the Bank order gateway.