Source more PEP8 friendly

Change-Id: I033f2a365454c9f98ce2c34f7d1d5ad3c1516202