Some updates and fixes to the Cyclomatic Complexity calculation