Document refactor finished