Refator: flake8 recommendations