NSArray refactoring