Trivial: pep8 compliance tweaks

Change-Id: I3f6bf173cd46bd52f5723fec9792fe419b740df9