PEP8 fixes

This commit adds some fixes to reduce the number of PEP8 warnings produced
from each commit.

Change-Id: I3c2da53919fdaae34dc16dc012ae6589c4d7147a