fixup, refactor ios sink