pep8 fixes

Change-Id: If592949bb1dedfc3674d939d5244f5efd4a02eb3