Adjustments according to pep8.