[PEP8] changes

Change-Id: Ib9d0f0448c75c828cc5c843b77676c5b18597cfa
[PEP8] remove trailing whitespace

Change-Id: If9f4e72ce92223d40ec34cdebbeadbe076d3d772