Cleaned up code in anticipation of flake8.

Change-Id: Id710edb1a82110653e783fed13cd589cab75f38a