minor code cleanup and nuget correction