Cleaning up the build script