Start of resolving pep8 issues

* Minor pep8 fixes

Change-Id: I411896ba4e2afa670474d2f851ab4dd98660f15b
Merge "Start of resolving pep8 issues"