Fix pep8 rules

Change-Id: Id31476294863779b230f1e46a65a230d9ddf69af