Cleanup and reformatting to fit PEP-0008
Update the copyright.