some modest cleanup of builder script