Update for Xcode Beta 7 ( Where is iOS 8 new beta >< )
Refactoring is tough.