Small refactoring
Windows build script update