Resolve McCabe problem