Bug Fixes and some refactoring
Bug fixes
Removing nuget package