minor script cleanups