Cyclomatic complexity of oogen reduced