Refacto for patterns
Merge pull request #2 from flatMapDuke/rework_patterns

Refacto for patterns