Refactoring seems done. All seems correct