slight cleanup of win32 stuff