- Small refactorings, cleanups and updated csproj