[PEP8] changes, code improvements

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