NUget update
Code refactor