pep8 changes, improvements

Change-Id: If5f4f71335a11fc34dcff8a8adbe639f72d613eb