Added default install folder for Windows build
Some code cleanups