fixes. pep fixes

Change-Id: I2195a12390729ca63f135028bc99a56a617a3bac