Fixed compliance to flake8 version 2

Latest flake8 adds some rules... let's update the code accordingly!