Refactor after refactor qaqbanking.