pep8 fixes

Change-Id: Ie2aceecfae1cc7012898d6c164c988a9670fd393