Second refactoring of Powertypes pattern + delegates + cleaning