Tidied up some of DetectionSystemPaces