First pass of pep8 fixes

Change-Id: I9ca0ac539fa056d93c50bd4cf7c90cb950c7ef40