Cleanup
More cleanup
Prepare a version fit for Windows