Improving build script