Fixing PEP8 issues

Change-Id: Ic7d144ecf5c600667d00cb3e596d697822b3e7d9