VanFosson-Updates

Some minor clean up based on the Resharper settings and add a generator version of the calculator that is selectable via the options.