Conform to PEP 8

Change-Id: I660bfccea0b2a4c781464490d6905e8794cabcb9