PEP8 compliance

Change instances in code where flake8 complained

Change-Id: I0b125fcff39024f9d4bf3c4c26a863efd0fa5cba