Cleaning up adding unicode funcs