Fixed Nuget Package reference and small refactoring