Cleaned-up Generator code after switch to RazorEngine