Few more fixes to comply with pep8

Change-Id: I406e7a96491a75281861bc3b9f256c9bb41d2900