refactoring - 6g control structures