Clean syntax according to pep8