PEP8 Fixes

Change-Id: I448f9a9d5ebf2a20c7749c4c482e7b6b5869a77f