Script: Minor cleanup