Tidied up DetectionSystemGriffin