Refactor for Xcode 6.0 Beta5