Replaced old Generator with F#
Resharper cleanup