Beginning of change to respect pep8