Improving build scripts