Clean up interface
Python 3 support