Refactoring all of the existing patterns.