PEP8 stuff

Change-Id: I925e4fd488b490f9b9b8ff3fdb411eed74dfdd87