CLI script shortened