Refactor to Modern Objectiv-C