Cleanup Windows internals
Merge pull request #142 from tklengyel/windows_cleanup

Cleanup Windows internals