Refactoring to Prototypes 2