Summary: ...and some minor stylistic cleanup
Reviewed-by: khazra, dsamersoff, michaelm