- refactor operativeUnit