Minor Objective C refactoring