[rhubarbtree]

Enlightenment. I trod the same path. The solution to refactoring is tests, but having simpler code greatly improves this anyway.