Code refactored
NuGet package updated