Fixing the cyclomatic complexity