Reducing cyclomatic complexity
Reduce breakage from infinite recursion
Reducing method length
More rubocop progress