and so the crazy refactoring process sees the sunlight after some months
in the dark!