Cleaning after pep8 and pylint