When doing a test using pycodestyle instead of pep8, a few errors were reported. Fix those errors so it passed the tests. Change-Id: I8e280aeab0575bd5a0919cbe4b9292df51c987ed
When doing a test using pycodestyle instead of pep8, a few errors were reported. Fix those errors so it passed the tests. Change-Id: I8e280aeab0575bd5a0919cbe4b9292df51c987ed