Cleaned up 'mbstring' some more