Refactor for iPad