more cleanup, another style/syntax pass through script.setup