Fix pep8 issues

Change-Id: I7131191355d248956462be750d271624dc7c5cdd