Drop support for .NET 3.5
Fix culture dependance
clean up formatting