minor refactoring and added version to nuget