Fix #1435 by cleaning up our code a bit
Merge pull request #1673 from NuGet/anurse/1435-cleanupcode

Fix #1435 by cleaning up our code a bit