Objects fixed
Refactorization complete (...)