Few more fixes to comply with pep8

Change-Id: Ib430496afa885b66b7903902aed214079cd029c3