Fix pep8 issues

Change-Id: Ic1118d1ef45f78042edb8475b0111da6d46e2c43