Fix too complex violation