format source
Removing WIN32 related hacks from codebase