Pep8 fixies

Change-Id: Ic43eece26245836cddf553eaca01c28eb26ee94e