Initial refactoring redone after lost in the merge