Slight PEP8 cleanup. Debating styles, some lines still >79 chars wide