Minor cleanups of main script

Change-Id: I174416a84d26ec85b443b071cf8457ad7c689377
1 file changed