switched from csharp to dotnet, some cosmetics