Fix a pep8 and a pyflakes errors

Change-Id: I5a82dfe1fab3382cabc7cb3f0765dc17fe6aa55a
PEP8: Remove an extra line

Change-Id: I8051173010e5bd7b2111c2a2a4135f717cf7da9e