Conform to PEP 8

Change-Id: I60e4f9f76d95361e11e0875659dba9604cebc660