Clean up data classes. Use unicode() not str().