Cleanup throughout, including 80-char limit and other PEP 8