Fix various smaller pep8 issues

Change-Id: Icc015418e0e231311ac0a0cc507fa3f8842d8811