[Mercy/Ernesto] - refactoring report