Minor cleanup of scripts