[BOFTWO-1211] refactoring