Refactored iphone build