cleanup, refactoring, nuget support