Some basic cyclomatic complexity simplifications