Some style nit cleanups.

We aren't really line length sensitive
so we can have lengths that others may
find bad (anything greater > 79). The
new pep8 rules say up to 100 is ok, so
I think thats fine with me.

Change-Id: Iaf0ba9dc244d0a4245f463fc9facd8c0d2be25f7