Tidied up using directives
Upgraded NuGet packages to latest versions.