Rafact seems successfull
Refactoring seems done. All seems correct