pep8 fixes

Change-Id: Ifa55ee551fdec2accf05bf02d2f13b93fdd1ade2