[PEP8] changes, code improvements

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