changes to comply with pep8 except for long lines