Update for iOS 8
Clean up code and more conversion of iOS8