Tidied the build script