pep8 changes

Change-Id: I3cafd965dab4b9cd8947d2a94e0ca72559c9d493