Cleaning up flake8 errors

Change-Id: If9b2f1ddfdf32d22f38fee25a8e7879a1f393cd9