PEP8, line lengths largely down to 100