Refactored, made work with whole words, finding bark-diff
Consolidated code and refactored