Cleaned up the build script