More pep8 compliant