Title: Refactoring to Patterns