Conform to PEP 8

Change-Id: I2c1196183fc3bcf4a357ef8190ce766befa51050