tweaks to ffip-patterns, remove duplication, change cljr prefix