Refactor: Convert to modern Objective-C syntax