Refactored to use a simplify function.
Refactored to use a simplify function.

albertodall/Numsense,ploeh/Numsense,ploeh/Numsense,ErikSchierboom/Numsense,simegeorge/Numsense,wk-j/Numsense,simegeorge/Numsense,albertodall/Numsense,ErikSchierboom/Numsense