Merge pull request #6 from JonathanPrince/likeness

Likeness
refactor to remove similar functions