Cyclomatic complexity of oogen reduced further