More pep8 tweaks

Change-Id: I89f9301496dcd5ddc330bae419691654a7e24b28