Clean up and add windows compile code