cleaned up Unicode handling