- Small cleanups + more c# generator code