Merge pull request #10 from JonathanPrince/likeness

refactor to remove similar functions
refactor final if clauses of module return