More Polishing of QuickStart Code