pep8 fixes

Change-Id: I69a1c92f62f13fd8da952fd49d7b1f531983ab55