Resolved PEP8 issues

Change-Id: Iffd5c6bab7789e20aecb8e011fe1860c37c9fe06