General cleanup

Mostly whitespace fixes, and little simplifications
of variables and conditions.

Change-Id: Ib1db79f432514483a98bd20b4309e77e03322df2
Merge "General cleanup"