Minor script cleanup