Clean up
Add Python 3 support