[PEP8] changes, code improvements

Change-Id: Ibfa8741849c0c59d38963afac94ba92a2765bdf7
Merge "[PEP8] changes, code improvements"