First pass at PEP8 and other cosmetics