Refactoring to the solid model