Cleaning up and taking suggestions for UCDetector