Cleaned up CharsetUtils a bit