Increase max cyclomatic complexity to 17