refactoring things that were accidentally mac-only