Improve the build script