Conform to PEP 8

Change-Id: I9c47b0b6f5a25e35b0eaf3c074fe579f69529db4