Simplified Logic

and added some helpers and whatnot.
Merge pull request #4 from InfernalLogic/functionfinder_refactor

Simplified Logic