Rename Simplifier to Main
Fix for binary math ops