Alignment/cleanup.
Pushed to PyPi.