Cleaned up for PyPi.