pep8 changes

Change-Id: I4cf67a6b69a0a34b5dd2ebf9ef21904b6c3af563