cleanup
Python 3 compatibility : stop using basestring