[PEP8] changes, code improvements

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