[PEP8] changes, code improvements

Change-Id: I6aef8bebee7b76cb3684a1ee95c0ea151ff9d852