post review fixes, fix leak of private data, use from __future__ import unicode_literals