Fix import statement on iOS
Use new module export and smaller clean-ups