Updated to iOS7 minor refactoring