HitDetector class, some cleanup