Fixing PEP8 issues

Change-Id: I7906677694e4ff7776b1b5b7359df54b176fd08d