better charset & cleanup