refactoring gang controls

refactoring gang controls