Style cleanup
Improve by not getting the same AD group twice