First pass of compliance with pep-0008, max 79 columns