A little cleanup.
Further patterns improvements.
Merge pull request #2 from bkoninski-neducatio/master

Patterns improvements