Refactor for Xcode 6.0 Beta3 (6A254o)