A bit of code cleanup before pushing a new NuGet package
INCR version 0.9 ...last release before fixing the public API so far