Moar iOS refactor