Tweaks according to pep8, pyflakes and PyCharm