Fix CyclomaticComplexity as well