Even more code review for .NET adherence