A few pep8 cleanups.

Change-Id: Ic5a7f3f24c1312e3b48e380457729791ea9eab03