Nuget package update.
code refactoring.