Fix PEP8 based on the latest version of flake8
Merge pull request #617 from elyezer/pep8-improvement

Fix PEP8 based on the latest version of flake8