Cleaning up build scripts somewhat