reformatting to match PEP8 (except for long lines)