Conform to PEP 8

Change-Id: I76020646215eee011d35f20da9c28d4aaab49e73