It's PyPI, not PyPi
I prefer newlines at the end of text files
Minor cleanup for the Apache formatter