Refactoring Fat Models with Patterns

Refactoring